summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-04-12 00:10:11 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:18 +0100
commit8bd20eb12861c1946af63ca7b0ba5303b1b212d5 (patch)
tree3081ec7b4daea3789251af6e314a3c4dd8c70de4 /meta/recipes-kernel
parent26454110745b9d64baeb35295c730a99bc779bd7 (diff)
downloadpoky-8bd20eb12861c1946af63ca7b0ba5303b1b212d5.tar.gz
linux-yocto/3.14: aufs, edgerouter config and -rt
Updating the 3.14 SRCREVs to import the following changes: - enable AUFS: a missing Kbuild patch was preventing aufs from compiling - edgerouter: remove RTC configuration options - preempt-rt recipe. The patch for 3.14 is availble, so we populate the recipe. (From OE-Core rev: 8e38a24a9d9cd44733a25d3de307907a788d643d) (From OE-Core rev: 6d2dcba210ac60ec709eb6956c34474a021ab425) 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_3.14.bb27
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb16
3 files changed, 37 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
new file mode 100644
index 0000000000..330eda4f1f
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -0,0 +1,27 @@
1require recipes-kernel/linux/linux-yocto.inc
2
3KBRANCH = "standard/preempt-rt/base"
4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5
6SRCREV_machine ?= "b5ed38affb23ff64a0382ee0dd116ffe74c4a379"
7SRCREV_machine_qemuppc ?= "79cb133d2d1b0b816cc1cd888f4ed4ef81570793"
8SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
11
12LINUX_VERSION ?= "3.14"
13
14PV = "${LINUX_VERSION}+git${SRCPV}"
15
16KMETA = "meta"
17
18LINUX_KERNEL_TYPE = "preempt-rt"
19
20COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)"
21
22# Functionality flags
23KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
24KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
25KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
26KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
27KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index a441a53fb9..c4cd331ab7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 11SRCREV_machine ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
12SRCREV_meta ?= "928d7b2ddad0abc8827055c51ba34225878344a0" 12SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 7f0ec2b559..2c2cace0dd 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -10,14 +10,14 @@ KBRANCH_qemux86 = "standard/common-pc/base"
10KBRANCH_qemux86-64 = "standard/common-pc-64/base" 10KBRANCH_qemux86-64 = "standard/common-pc-64/base"
11KBRANCH_qemumips64 = "standard/mti-malta64" 11KBRANCH_qemumips64 = "standard/mti-malta64"
12 12
13SRCREV_machine_qemuarm ?= "c966987f88a0ee5753c3dee87e7a962d0cad5376" 13SRCREV_machine_qemuarm ?= "d7a5330e50f78f63789b91cb9880b38633d33450"
14SRCREV_machine_qemumips ?= "61811c215c601ee96ccbf79333bbc73482b0f017" 14SRCREV_machine_qemumips ?= "38f344fcab8c0ee29f40edb92dd6612eff4579bf"
15SRCREV_machine_qemuppc ?= "0d5cf5e938f4e6d3c6a398e98c8ece3ce05539f7" 15SRCREV_machine_qemuppc ?= "b28241db34ab66f9e86718d8c94276d65d2457bb"
16SRCREV_machine_qemux86 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 16SRCREV_machine_qemux86 ?= "f9048769cc178f2f64ed492a9a649827167d9a34"
17SRCREV_machine_qemux86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 17SRCREV_machine_qemux86-64 ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
18SRCREV_machine_qemumips64 ?= "ccb2a788551a7951563ac44a27175c6f28501008" 18SRCREV_machine_qemumips64 ?= "c4e08d47c5eb36ae056f2eab82a74c3638e72e06"
19SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 19SRCREV_machine ?= "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61"
20SRCREV_meta ?= "928d7b2ddad0abc8827055c51ba34225878344a0" 20SRCREV_meta ?= "09424cee646626c04105f08455a58fabb27eff31"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
23 23