summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_4.9.bb
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/recipes-kernel/linux/linux-yocto_4.9.bb
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/recipes-kernel/linux/linux-yocto_4.9.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.9.bb2
1 files changed, 1 insertions, 1 deletions
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}"