summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-04-13 12:12:13 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-14 10:58:34 +0100
commitaab3c8d56dd6344b1e6cf38e610970bc68b2f624 (patch)
tree0c636d610d4c56c10a77050fffdaef5848b602c4 /meta/recipes-kernel
parentd75d2be934ae16d10a17676a68bd8286c042ad7c (diff)
downloadpoky-aab3c8d56dd6344b1e6cf38e610970bc68b2f624.tar.gz
linux-yocto: make aufs4 optional
An always on configuration of aufs4 crept into the default kernel configuration blocks. With this change, aufs-enable.scc can be used to turn on aufs via a KERNEL_FEATURES entry. We can now have co-existing unionfs solutions and can update them without breaking builds that haven't opted-in. (From OE-Core rev: 5d3d6224ec2abbbeb5b9a292d208040b89cc4b98) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb18
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index cb245eeb91..d81ca13872 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5SRCREV_machine ?= "328830680bc35257c83fc400d9d8e2ae94d86f77" 5SRCREV_machine ?= "2bc112a6ccd16800a4c45e47ccb3018a1042abdf"
6SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b" 6SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
7 7
8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index 2821f448e7..684e880985 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.3"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7" 12SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
13SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b" 13SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 5509dd697b..3c5ee1bd43 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "d0dae8a98254e7ddd8d9be107e33c3a492bccdae" 14SRCREV_machine_qemuarm ?= "ec9167bcb0ccd4897177c5e235af68b5890aa326"
15SRCREV_machine_qemuarm64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7" 15SRCREV_machine_qemuarm64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
16SRCREV_machine_qemumips ?= "9024e9c842557e258a88470f8b1a772df18d9813" 16SRCREV_machine_qemumips ?= "900f98d3ab6498bc7f4ff6b7a489db3bca4e6417"
17SRCREV_machine_qemuppc ?= "db28bb1e7a682362f58cc42fbb679022df9657a7" 17SRCREV_machine_qemuppc ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
18SRCREV_machine_qemux86 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7" 18SRCREV_machine_qemux86 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
19SRCREV_machine_qemux86-64 ?= "db28bb1e7a682362f58cc42fbb679022df9657a7" 19SRCREV_machine_qemux86-64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
20SRCREV_machine_qemumips64 ?= "88fb42ec863d20ccde57dd35da06d6221cfb4c03" 20SRCREV_machine_qemumips64 ?= "4b08dfb1fb3bc7659e8f3e13665597d9a9f0816d"
21SRCREV_machine ?= "db28bb1e7a682362f58cc42fbb679022df9657a7" 21SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05"
22SRCREV_meta ?= "ab0d998117cca8c55f7ca49ec98b843782bdd25b" 22SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"