diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-06-29 15:42:38 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-04 17:40:32 +0100 |
commit | 5783db46228d8289b8e614ce4616ebf43edddaf0 (patch) | |
tree | 05b7399acaefea289796d127cfb8f20f74408d3f /meta | |
parent | 60ea6f475a40bbaf7acd3170d3171fbc0056055e (diff) | |
download | poky-5783db46228d8289b8e614ce4616ebf43edddaf0.tar.gz |
linux-yocto/3.4: v3.4.4 + configuration updates
Bumping the kernel version to v3.4.4 and importing the following
meta branch commits:
9b7c74b meta: bump kver to v3.4.4
8231dec ck: relocate config post patches
26b965e net_sched: remove dupicate configuration option
df8bf19 meta: remove non applying routerstationpro patch
292d8ea arm: import upstream versatile io.h fix
f4824b1 net_sched: select ACT as a dependency of INGRESS
30ae722 cgroups: delete obsolete namespace option
51f94f0 meta: add qemumipsel mapping
Built and boot tested on qemu*
(From OE-Core rev: 3d33b8c8b3be5dcdac30c115b9fec427269db2b4)
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_3.4.bb | 8 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 17 |
2 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index 4afcf65fb5..f85683709c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | |||
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH = "standard/preempt-rt/base" | 3 | KBRANCH = "standard/preempt-rt/base" |
4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" | 4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" |
5 | 5 | ||
6 | LINUX_VERSION ?= "3.4.3" | 6 | LINUX_VERSION ?= "3.4.4" |
7 | LINUX_KERNEL_TYPE = "preempt-rt" | 7 | LINUX_KERNEL_TYPE = "preempt-rt" |
8 | 8 | ||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | 10 | ||
11 | SRCREV_machine ?= "4a688295a1c6d44f3eea409d51a0344c8830d829" | 11 | SRCREV_machine ?= "e24c02204c70e9280115d6512eb54c884dee5fa7" |
12 | SRCREV_machine_qemuppc ?= "83843542dd524007547eddba507690cd4bab393b" | 12 | SRCREV_machine_qemuppc ?= "b610e46c0ae57e483449c08619d92b8531e75ef5" |
13 | SRCREV_meta ?= "51f94f06fe908a910564687942fdd82809f82348" | 13 | SRCREV_meta ?= "9b7c74bc8e205edb403744098b9d62690c25803e" |
14 | 14 | ||
15 | PR = "${INC_PR}.0" | 15 | PR = "${INC_PR}.0" |
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 892f058d99..b21c15d14f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
@@ -10,18 +10,17 @@ KBRANCH_qemumips64 = "standard/mti-malta64" | |||
10 | KBRANCH_qemumips64el = "standard/mti-malta64" | 10 | KBRANCH_qemumips64el = "standard/mti-malta64" |
11 | KBRANCH_qemuarm = "standard/arm-versatile-926ejs" | 11 | KBRANCH_qemuarm = "standard/arm-versatile-926ejs" |
12 | 12 | ||
13 | SRCREV_machine_qemuarm ?= "4e354f7fa345464f284525a27eb1544cbc60968d" | 13 | SRCREV_machine_qemuarm ?= "168ed084c978a39eabf0071f0049b623bc05c856" |
14 | SRCREV_machine_qemumips ?= "c65bc98cd501459bb6ffc7b5ec5a7e72c41dceef" | 14 | SRCREV_machine_qemumips ?= "66dbebd43d65eb070e0afa25f63f6b69ddd47c65" |
15 | SRCREV_machine_qemumipsel ?= "c65bc98cd501459bb6ffc7b5ec5a7e72c41dceef" | 15 | SRCREV_machine_qemuppc ?= "bc74ca65c9cae025861455d7f0a259458cd4a829" |
16 | SRCREV_machine_qemuppc ?= "ee3475b4ca8c9e26f55f6e107101d832e7dec7ac" | 16 | SRCREV_machine_qemux86 ?= "d345461f0d52d1a82553c2edd845a8bee908923f" |
17 | SRCREV_machine_qemux86 ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5" | 17 | SRCREV_machine_qemux86-64 ?= "d345461f0d52d1a82553c2edd845a8bee908923f" |
18 | SRCREV_machine_qemux86-64 ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5" | 18 | SRCREV_machine ?= "d345461f0d52d1a82553c2edd845a8bee908923f" |
19 | SRCREV_machine ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5" | 19 | SRCREV_meta ?= "9b7c74bc8e205edb403744098b9d62690c25803e" |
20 | SRCREV_meta ?= "51f94f06fe908a910564687942fdd82809f82348" | ||
21 | 20 | ||
22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 21 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" |
23 | 22 | ||
24 | LINUX_VERSION ?= "3.4.3" | 23 | LINUX_VERSION ?= "3.4.4" |
25 | 24 | ||
26 | PR = "${INC_PR}.0" | 25 | PR = "${INC_PR}.0" |
27 | PV = "${LINUX_VERSION}+git${SRCPV}" | 26 | PV = "${LINUX_VERSION}+git${SRCPV}" |