summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-02-14 16:14:20 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-19 06:16:58 -0800
commitb327597104985ea6601acdabe620031c60fdb0e1 (patch)
treee68f06896a96a9be5e2cb90fe91bea9201ed474f /meta
parent3c3cba24bd96e47fd4dd297a86caf9ac42756025 (diff)
downloadpoky-b327597104985ea6601acdabe620031c60fdb0e1.tar.gz
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 (From OE-Core rev: 7fc93859ce805a604814b1b373d77ecc547e812f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.9.bb2
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 () {
12} 12}
13 13
14SRCREV_machine ?= "ffd0a071c2df55ecb2bb1f101465df93a81093b5" 14SRCREV_machine ?= "ffd0a071c2df55ecb2bb1f101465df93a81093b5"
15SRCREV_meta ?= "c19322afb12490d9f5ad0182339bff2fe13e778b" 15SRCREV_meta ?= "ea8a679c9542ab214e4afebcbc82a929624daeb5"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" 18 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 () {
12} 12}
13 13
14SRCREV_machine ?= "01a64b0469256a432af0b8a0f27d32694e908e8b" 14SRCREV_machine ?= "01a64b0469256a432af0b8a0f27d32694e908e8b"
15SRCREV_meta ?= "f9cb76e24e3a73b8eda70ea9bd91ba5a52711521" 15SRCREV_meta ?= "8f3bc608ae61c5333043167fa31bac33be93c3de"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 18 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"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "db2e91ce904f32347ccf739de969b4216cbcaf92" 12SRCREV_machine ?= "db2e91ce904f32347ccf739de969b4216cbcaf92"
13SRCREV_meta ?= "c19322afb12490d9f5ad0182339bff2fe13e778b" 13SRCREV_meta ?= "ea8a679c9542ab214e4afebcbc82a929624daeb5"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
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"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" 12SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f"
13SRCREV_meta ?= "f9cb76e24e3a73b8eda70ea9bd91ba5a52711521" 13SRCREV_meta ?= "8f3bc608ae61c5333043167fa31bac33be93c3de"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
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"
19SRCREV_machine_qemux86-64 ?= "c50f695341260d4757af64d809390610aae213e1" 19SRCREV_machine_qemux86-64 ?= "c50f695341260d4757af64d809390610aae213e1"
20SRCREV_machine_qemumips64 ?= "40a880b0f21aa09f3b52d68969339d80f9cc10ad" 20SRCREV_machine_qemumips64 ?= "40a880b0f21aa09f3b52d68969339d80f9cc10ad"
21SRCREV_machine ?= "c50f695341260d4757af64d809390610aae213e1" 21SRCREV_machine ?= "c50f695341260d4757af64d809390610aae213e1"
22SRCREV_meta ?= "c19322afb12490d9f5ad0182339bff2fe13e778b" 22SRCREV_meta ?= "ea8a679c9542ab214e4afebcbc82a929624daeb5"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" 25 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"
19SRCREV_machine_qemux86-64 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" 19SRCREV_machine_qemux86-64 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f"
20SRCREV_machine_qemumips64 ?= "13818cbe0b9f0e2e7542b7c088b5719c7a463da9" 20SRCREV_machine_qemumips64 ?= "13818cbe0b9f0e2e7542b7c088b5719c7a463da9"
21SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" 21SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f"
22SRCREV_meta ?= "f9cb76e24e3a73b8eda70ea9bd91ba5a52711521" 22SRCREV_meta ?= "8f3bc608ae61c5333043167fa31bac33be93c3de"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"