diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-08-28 16:12:19 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-28 23:33:25 +0100 |
commit | 8b36aa4092a344c4a616228d0ae73210c20ddfae (patch) | |
tree | 2db42cc7a85957510afe785db1cf9552c7d3447d /meta | |
parent | 2051e4dff4384e1b618a050aeebf72a76cadab4b (diff) | |
download | poky-8b36aa4092a344c4a616228d0ae73210c20ddfae.tar.gz |
linux-yocto/3.10: fix ssh login and restore CC_OPTIMIZE_FOR_SIZE
Updating the BSP SRCREVs with the following changes:
7144bcc Revert "timer_list: Split timer_list_show_tickdevices"
1c0d1d8 Revert "timer_list: Convert timer list to be a proper seq_file"
To temporarily fix the ability to log in via ssh on some host/image combinations.
Updating the meta SRCREV for:
cd502a8 meta/standard: standard configuration fragment must be first
Which was incorrectly overriding feature and arch configuration values.
[YOCTO #5064]
[YOCTO #5062]
(From OE-Core rev: 3bfe8aa750f88efad7e87185b8eff8c03418efd4)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
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.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.10.bb | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index eb34491fac..0e137ff119 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | |||
@@ -3,9 +3,9 @@ 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 | SRCREV_machine ?= "77c5842818867366c3d08ca1dec19dc43aee0e91" | 6 | SRCREV_machine ?= "8a9b4902683f586f7d656c2e6747e314a5e1ed0e" |
7 | SRCREV_machine_qemuppc ?= "7be83bc1124d2a2c75f99df94baaf718659722ea" | 7 | SRCREV_machine_qemuppc ?= "655d20d4f64dc053b40ac8d8fe44b82dec5e130a" |
8 | SRCREV_meta ?= "1b9b113837f353fd94148beb6bd00a3b7b35d01d" | 8 | SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446" |
9 | 9 | ||
10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
11 | 11 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb index 2a30b82b0d..82dea9c97b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.10.9" | |||
9 | 9 | ||
10 | KMETA = "meta" | 10 | KMETA = "meta" |
11 | 11 | ||
12 | SRCREV_machine ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | 12 | SRCREV_machine ?= "7144bcc4b8091675bfcf1941479067857b6242da" |
13 | SRCREV_meta ?= "1b9b113837f353fd94148beb6bd00a3b7b35d01d" | 13 | SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index ea6ad2a74d..cacb87321f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb | |||
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH_DEFAULT = "standard/base" | 3 | KBRANCH_DEFAULT = "standard/base" |
4 | KBRANCH = "${KBRANCH_DEFAULT}" | 4 | KBRANCH = "${KBRANCH_DEFAULT}" |
5 | 5 | ||
6 | SRCREV_machine_qemuarm ?= "8675d3d0a3c17135f70ef474d5c362397c02e62a" | 6 | SRCREV_machine_qemuarm ?= "24d53cd6ca4c3ae8f5dd2ff840f9275327d955ee" |
7 | SRCREV_machine_qemumips ?= "992b743b905edd21d3a4a27c92b5c6a9e44d7d73" | 7 | SRCREV_machine_qemumips ?= "0480771238bb87031b79ecb1ee6bce7bfe6ffb1c" |
8 | SRCREV_machine_qemuppc ?= "09388c3572e26c78b34554e46e077f12be7b2401" | 8 | SRCREV_machine_qemuppc ?= "a9c383957f69e70fd2cb27d885160303a305cf57" |
9 | SRCREV_machine_qemux86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | 9 | SRCREV_machine_qemux86 ?= "7144bcc4b8091675bfcf1941479067857b6242da" |
10 | SRCREV_machine_qemux86-64 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | 10 | SRCREV_machine_qemux86-64 ?= "7144bcc4b8091675bfcf1941479067857b6242da" |
11 | SRCREV_machine_qemumips64 ?= "203679cb23c752fdcbc0180a55a81728d7462561" | 11 | SRCREV_machine_qemumips64 ?= "10a8db0603d7186633a6bf90e2308710763e718e" |
12 | SRCREV_machine ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | 12 | SRCREV_machine ?= "7144bcc4b8091675bfcf1941479067857b6242da" |
13 | SRCREV_meta ?= "1b9b113837f353fd94148beb6bd00a3b7b35d01d" | 13 | SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446" |
14 | 14 | ||
15 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 15 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
16 | 16 | ||