[meta-measured][PATCH 0/7] Update to latest oe-core/Poky

[meta-measured][PATCH 0/7] Update to latest oe-core/Poky

[Saul Wold]

This patch set updates to use the latest 3.10 kernel and adds the needed
support, including switching form unionfs to aufs for the initramfs.  

Saul Wold (7):
  trousers: Add libgcc as Runtime dependency
  linux-yocto: Update to 3.10 and set as default
  measured-image-bootimg: imstall mboot.c32 for iso
  measured-image-bootimg: add libcom32
  pcr-calc: Use site-packages instead of dist-packages
  init-boot-tpm.sh: Use aufs instead of unionfs for 3.10 kernel
  core-image-tpm: add kmod and udev-extraconf

 conf/distro/oe-measured.conf                                           | 2 +-
 .../linux/{linux-yocto_3.8.bbappend => linux-yocto_3.10.bbappend}      | 0
 recipes-tpm/images/core-image-tpm-initramfs.bb                         | 2 ++
 recipes-tpm/images/core-image-tpm.inc                                  | 3 ++-
 recipes-tpm/initrdscripts/files/init-boot-tpm.sh                       | 2 +-
 recipes-tpm/trousers/trousers_0.3.10.bb                                | 2 ++
 recipes-txt/images/measured-image-bootimg.inc                          | 2 ++
 recipes-txt/pcr-calc/pcr-calc_git.bb                                   | 2 +-
 8 files changed, 11 insertions(+), 4 deletions(-)
 rename recipes-kernel/linux/{linux-yocto_3.8.bbappend => linux-yocto_3.10.bbappend} (100%)

-- 
1.8.3.1

[meta-measured][PATCH 1/7] trousers: Add libgcc as Runtime dependency

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-tpm/trousers/trousers_0.3.10.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-tpm/trousers/trousers_0.3.10.bb b/recipes-tpm/trousers/trousers_0.3.10.bb
index 33b2816..28594d2 100644
--- a/recipes-tpm/trousers/trousers_0.3.10.bb
+++ b/recipes-tpm/trousers/trousers_0.3.10.bb
@@ -71,6 +71,8 @@ FILES_${PN}-doc = " \
 	${mandir}/man8 \
 	"
 
+RDEPENDS_${PN} = "libgcc"
+
 inherit autotools useradd
 
 EXTRA_OECONF="--with-gui=none"
-- 
1.8.3.1

Re: [meta-measured][PATCH 1/7] trousers: Add libgcc as Runtime dependency

[Philip Tricca]

Saul,

Awesome patch set. This is the only one I can't figure out. Does tcsd
really need libgcc? 'ldd' doesn't say anything about dependencies. I'm
sure it's just that I'm not looking in the right place. Mind pointing it
out for me?

Thanks,
- Philip

On 11/01/2013 06:02 PM, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  recipes-tpm/trousers/trousers_0.3.10.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/recipes-tpm/trousers/trousers_0.3.10.bb b/recipes-tpm/trousers/trousers_0.3.10.bb
> index 33b2816..28594d2 100644
> --- a/recipes-tpm/trousers/trousers_0.3.10.bb
> +++ b/recipes-tpm/trousers/trousers_0.3.10.bb
> @@ -71,6 +71,8 @@ FILES_${PN}-doc = " \
>  	${mandir}/man8 \
>  	"
>  
> +RDEPENDS_${PN} = "libgcc"
> +
>  inherit autotools useradd
>  
>  EXTRA_OECONF="--with-gui=none"
> 

[meta-measured][PATCH 2/7] linux-yocto: Update to 3.10 and set as default

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 conf/distro/oe-measured.conf                                            | 2 +-
 .../linux/{linux-yocto_3.8.bbappend => linux-yocto_3.10.bbappend}       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename recipes-kernel/linux/{linux-yocto_3.8.bbappend => linux-yocto_3.10.bbappend} (100%)

diff --git a/conf/distro/oe-measured.conf b/conf/distro/oe-measured.conf
index 60ad0c2..52f2cae 100644
--- a/conf/distro/oe-measured.conf
+++ b/conf/distro/oe-measured.conf
@@ -2,4 +2,4 @@ DISTRO = "oe-measured"
 DISTROOVERRIDES = "tpm:txt"
 
 DISTRO_FEATURES_append = " tpm txt usb3 "
-PREFERRED_VERSION_linux-yocto = "3.8%"
+PREFERRED_VERSION_linux-yocto = "3.10%"
diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
similarity index 100%
rename from recipes-kernel/linux/linux-yocto_3.8.bbappend
rename to recipes-kernel/linux/linux-yocto_3.10.bbappend
-- 
1.8.3.1

[meta-measured][PATCH 3/7] measured-image-bootimg: imstall mboot.c32 for iso

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-txt/images/measured-image-bootimg.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-txt/images/measured-image-bootimg.inc b/recipes-txt/images/measured-image-bootimg.inc
index ba99f32..d130ce4 100644
--- a/recipes-txt/images/measured-image-bootimg.inc
+++ b/recipes-txt/images/measured-image-bootimg.inc
@@ -31,6 +31,7 @@ syslinux_iso_populate_append() {
 # have bootimg populate function grab tboot and ACM
 populate_append() {
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/tboot-${MACHINE}.gz ${DEST}/tboot.gz
+	install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${DEST}
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/acm_*.bin ${DEST}/
 }
 
-- 
1.8.3.1

[meta-measured][PATCH 4/7] measured-image-bootimg: add libcom32

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-txt/images/measured-image-bootimg.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-txt/images/measured-image-bootimg.inc b/recipes-txt/images/measured-image-bootimg.inc
index d130ce4..8b00a17 100644
--- a/recipes-txt/images/measured-image-bootimg.inc
+++ b/recipes-txt/images/measured-image-bootimg.inc
@@ -32,6 +32,7 @@ syslinux_iso_populate_append() {
 populate_append() {
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/tboot-${MACHINE}.gz ${DEST}/tboot.gz
 	install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${DEST}
+	install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${DEST}
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/acm_*.bin ${DEST}/
 }
 
-- 
1.8.3.1

[meta-measured][PATCH 5/7] pcr-calc: Use site-packages instead of dist-packages

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-txt/pcr-calc/pcr-calc_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-txt/pcr-calc/pcr-calc_git.bb b/recipes-txt/pcr-calc/pcr-calc_git.bb
index 60d6e7f..44c5765 100644
--- a/recipes-txt/pcr-calc/pcr-calc_git.bb
+++ b/recipes-txt/pcr-calc/pcr-calc_git.bb
@@ -13,6 +13,6 @@ SRC_URI += " \
     git://github.com/flihp/pcr-calc.git \
 "
 SRCREV = "master"
-FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/pcr-calc"
+FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/pcr-calc"
 
 inherit autotools
-- 
1.8.3.1

[meta-measured][PATCH 6/7] init-boot-tpm.sh: Use aufs instead of unionfs for 3.10 kernel

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-tpm/initrdscripts/files/init-boot-tpm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-tpm/initrdscripts/files/init-boot-tpm.sh b/recipes-tpm/initrdscripts/files/init-boot-tpm.sh
index 45a6f4d..27e9f8d 100644
--- a/recipes-tpm/initrdscripts/files/init-boot-tpm.sh
+++ b/recipes-tpm/initrdscripts/files/init-boot-tpm.sh
@@ -136,7 +136,7 @@ mount_rootimg() {
     if ! $MOUNT -t tmpfs -o rw,noatime,mode=755 tmpfs $cow_mnt ; then
         fatal "Failed to mount tmpfs to back rootfs union."
     fi
-    if ! $MOUNT -t unionfs -o dirs=$cow_mnt=rw:$rootro_mnt=ro unionfs $root_mnt ; then
+    if ! $MOUNT -t aufs -o dirs=$cow_mnt=rw:$rootro_mnt=ro none $root_mnt ; then
         fatal "Failed to mount union between $root_img and tmpfs at $cow_mnt."
     fi
 }
-- 
1.8.3.1

[meta-measured][PATCH 7/7] core-image-tpm: add kmod and udev-extraconf

[Saul Wold]

Add these two packages to ensure media gets mounted correct and the modules are loaded, they
are needed in both the core image and the initramfs

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 recipes-tpm/images/core-image-tpm-initramfs.bb | 2 ++
 recipes-tpm/images/core-image-tpm.inc          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-tpm/images/core-image-tpm-initramfs.bb b/recipes-tpm/images/core-image-tpm-initramfs.bb
index 16b009f..f17e37d 100644
--- a/recipes-tpm/images/core-image-tpm-initramfs.bb
+++ b/recipes-tpm/images/core-image-tpm-initramfs.bb
@@ -7,9 +7,11 @@ IMAGE_INSTALL = " \
     initramfs-boot-tpm \
     busybox \
     udev \
+    udev-extraconf \
     base-passwd \
     packagegroup-tpm \
     coreutils \
+    kmod \
     "
 
 # Do not pollute the initrd image with rootfs features
diff --git a/recipes-tpm/images/core-image-tpm.inc b/recipes-tpm/images/core-image-tpm.inc
index 7024d33..10a3ce0 100644
--- a/recipes-tpm/images/core-image-tpm.inc
+++ b/recipes-tpm/images/core-image-tpm.inc
@@ -6,7 +6,8 @@ LICENSE = "MIT"
 
 IMAGE_INSTALL += "\
 	${CORE_IMAGE_BASE_INSTALL} \
-	packagegroup-core-basic \
+	kmod udev-extraconf \
+	packagegroup-core-boot \
 	packagegroup-tpm \
 	packagegroup-tboot \
 "
-- 
1.8.3.1

Re: [meta-measured][PATCH 0/7] Update to latest oe-core/Poky

[Philip Tricca]

Thanks Saul,

I'll dust off my vPro test hardware this week and get these rolled in.

Regards,
- Philip

On 11/01/2013 06:02 PM, Saul Wold wrote:
> This patch set updates to use the latest 3.10 kernel and adds the needed
> support, including switching form unionfs to aufs for the initramfs.  
> 
> Saul Wold (7):
>   trousers: Add libgcc as Runtime dependency
>   linux-yocto: Update to 3.10 and set as default
>   measured-image-bootimg: imstall mboot.c32 for iso
>   measured-image-bootimg: add libcom32
>   pcr-calc: Use site-packages instead of dist-packages
>   init-boot-tpm.sh: Use aufs instead of unionfs for 3.10 kernel
>   core-image-tpm: add kmod and udev-extraconf
> 
>  conf/distro/oe-measured.conf                                           | 2 +-
>  .../linux/{linux-yocto_3.8.bbappend => linux-yocto_3.10.bbappend}      | 0
>  recipes-tpm/images/core-image-tpm-initramfs.bb                         | 2 ++
>  recipes-tpm/images/core-image-tpm.inc                                  | 3 ++-
>  recipes-tpm/initrdscripts/files/init-boot-tpm.sh                       | 2 +-
>  recipes-tpm/trousers/trousers_0.3.10.bb                                | 2 ++
>  recipes-txt/images/measured-image-bootimg.inc                          | 2 ++
>  recipes-txt/pcr-calc/pcr-calc_git.bb                                   | 2 +-
>  8 files changed, 11 insertions(+), 4 deletions(-)
>  rename recipes-kernel/linux/{linux-yocto_3.8.bbappend => linux-yocto_3.10.bbappend} (100%)
>