Update to latest oe-core/Poky
cover Update to latest oe-core/Poky
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%)Signature · 1 line
1.8.3.1
PATCH 1/7 trousers: Add libgcc as Runtime dependency
--- recipes-tpm/trousers/trousers_0.3.10.bb | 2 ++ 1 file changed, 2 insertions(+)
recipes-tpm/trousers/trousers_0.3.10.bb +2 -0
@@ -71,6 +71,8 @@ FILES_${PN}-doc = " \ ${mandir}/man8 \ " +RDEPENDS_${PN} = "libgcc" + inherit autotools useradd EXTRA_OECONF="--with-gui=none"
Signature · 1 line
1.8.3.1
Re: [meta-measured][PATCH 1/7] trousers: Add libgcc as Runtime dependency
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
Quoted 19 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>--- recipes-tpm/trousers/trousers_0.3.10.bb | 2 ++ 1 file changed, 2 insertions(+)recipes-tpm/trousers/trousers_0.3.10.bb +2
-0@@ -71,6 +71,8 @@ FILES_${PN}-doc = " \ ${mandir}/man8 \ " +RDEPENDS_${PN} = "libgcc" + inherit autotools useradd EXTRA_OECONF="--with-gui=none"
PATCH 2/7 linux-yocto: Update to 3.10 and set as default
In reply to Saul Wold---
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%)conf/distro/oe-measured.conf +1 -1
@@ -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%"
recipes-kernel/linux/linux-yocto_3.10.bbappend renamed from recipes-kernel/linux/linux-yocto_3.8.bbappend +0 -0
Signature · 1 line
1.8.3.1
PATCH 3/7 measured-image-bootimg: imstall mboot.c32 for iso
In reply to Saul Wold--- recipes-txt/images/measured-image-bootimg.inc | 1 + 1 file changed, 1 insertion(+)
recipes-txt/images/measured-image-bootimg.inc +1 -0
@@ -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}/ }
Signature · 1 line
1.8.3.1
PATCH 4/7 measured-image-bootimg: add libcom32
In reply to Saul Wold--- recipes-txt/images/measured-image-bootimg.inc | 1 + 1 file changed, 1 insertion(+)
recipes-txt/images/measured-image-bootimg.inc +1 -0
@@ -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}/ }
Signature · 1 line
1.8.3.1
PATCH 5/7 pcr-calc: Use site-packages instead of dist-packages
In reply to Saul Wold--- recipes-txt/pcr-calc/pcr-calc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-txt/pcr-calc/pcr-calc_git.bb +1 -1
@@ -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
Signature · 1 line
1.8.3.1
PATCH 6/7 init-boot-tpm.sh: Use aufs instead of unionfs for 3.10 kernel
In reply to Saul Wold--- recipes-tpm/initrdscripts/files/init-boot-tpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-tpm/initrdscripts/files/init-boot-tpm.sh +1 -1
@@ -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 }
Signature · 1 line
1.8.3.1
PATCH 7/7 core-image-tpm: add kmod and udev-extraconf
In reply to Saul WoldAdd 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
--- recipes-tpm/images/core-image-tpm-initramfs.bb | 2 ++ recipes-tpm/images/core-image-tpm.inc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
recipes-tpm/images/core-image-tpm-initramfs.bb +2 -0
@@ -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
recipes-tpm/images/core-image-tpm.inc +2 -1
@@ -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 \ "
Signature · 1 line
1.8.3.1
Thanks Saul,
I'll dust off my vPro test hardware this week and get these rolled in.
Regards,
- Philip
Quoted 23 lines · 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-packagesinit-boot-tpm.sh: Use aufs instead of unionfs for 3.10 kernel
core-image-tpm: add kmod and udev-extraconfconf/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%)