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 <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 71308310c94e0ca7638da9b3435f6f41a5c0917d..f99f200598d307ab9dd27fa9f4ca1ea9e081e09d 100644 (file)
--- 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 7521bc437f46c9e51c852c485f35f4ac815a2ef5..b47e6aaaed135632c0a7ad570ee3af50da9e4cee 100644 (file)
--- 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 52e2b5233b0ae2504ddf3c95a8730453b2bf68e6..18ef51788fd334237b7f935d7f5b6fd580987d2d 100644 (file)
--- 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 d92f49f50d03248ae5b5e64723c8ff9f19452340..e886f14cd7edb39aa4821589d4ae203263d0933b 100644 (file)
--- 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 a56ecdf23c560fb2f92e2103ea5d2aa8e1cdf94a..4c89183a35120acfab330aa2e8d9f4ea41129c54 100644 (file)
--- 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 ff9fda822b55211fdbd6e57eb468e59490d33ae0..f33ff7718d14dcac2897cf8d0cdc82b085115ae6 100644 (file)
--- 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}"