From 7fc93859ce805a604814b1b373d77ecc547e812f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 14 Feb 2017 16:14:20 -0500 Subject: linux-yocto/4.8/4.9: fix tpm.cfg and add dm-verity Integrating the following commits to fix a configuration warning and to add a tpm configuration feature: 8f3bc608ae61 features: add dm-verity 0ad64750fef1 tpm: avoid warning due to double CONFIG_TCG_TPM Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.9.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb index 71308310c9..f99f200598 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "ffd0a071c2df55ecb2bb1f101465df93a81093b5" -SRCREV_meta ?= "c19322afb12490d9f5ad0182339bff2fe13e778b" +SRCREV_meta ?= "ea8a679c9542ab214e4afebcbc82a929624daeb5" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index 7521bc437f..b47e6aaaed 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "01a64b0469256a432af0b8a0f27d32694e908e8b" -SRCREV_meta ?= "f9cb76e24e3a73b8eda70ea9bd91ba5a52711521" +SRCREV_meta ?= "8f3bc608ae61c5333043167fa31bac33be93c3de" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb index 52e2b5233b..18ef51788f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "db2e91ce904f32347ccf739de969b4216cbcaf92" -SRCREV_meta ?= "c19322afb12490d9f5ad0182339bff2fe13e778b" +SRCREV_meta ?= "ea8a679c9542ab214e4afebcbc82a929624daeb5" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb index d92f49f50d..e886f14cd7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" -SRCREV_meta ?= "f9cb76e24e3a73b8eda70ea9bd91ba5a52711521" +SRCREV_meta ?= "8f3bc608ae61c5333043167fa31bac33be93c3de" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb index a56ecdf23c..4c89183a35 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "c50f695341260d4757af64d809390610aae213e1" SRCREV_machine_qemux86-64 ?= "c50f695341260d4757af64d809390610aae213e1" SRCREV_machine_qemumips64 ?= "40a880b0f21aa09f3b52d68969339d80f9cc10ad" SRCREV_machine ?= "c50f695341260d4757af64d809390610aae213e1" -SRCREV_meta ?= "c19322afb12490d9f5ad0182339bff2fe13e778b" +SRCREV_meta ?= "ea8a679c9542ab214e4afebcbc82a929624daeb5" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb index ff9fda822b..f33ff7718d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" SRCREV_machine_qemux86-64 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" SRCREV_machine_qemumips64 ?= "13818cbe0b9f0e2e7542b7c088b5719c7a463da9" SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" -SRCREV_meta ?= "f9cb76e24e3a73b8eda70ea9bd91ba5a52711521" +SRCREV_meta ?= "8f3bc608ae61c5333043167fa31bac33be93c3de" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" -- cgit 1.2.3-korg