diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-03-06 09:03:14 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-08 11:55:36 -0800 |
| commit | f6bd7d33378d1b1bc161a0129d98be82854093ed (patch) | |
| tree | 2acf3276bdb322a78378688cfa2b6442ac259378 /meta/recipes-kernel | |
| parent | 7931b644c5da4b4a2447fd0f6660792a2d79cc41 (diff) | |
| download | poky-f6bd7d33378d1b1bc161a0129d98be82854093ed.tar.gz | |
linux-yocto/meta: fix incorrect config references
Updating the meta SRCREV to pickup the following fixes:
a9ffedb meta/fri2/sys940x: fix incorrect cfg includes
3d1a678 meta/sys940x: fix incorrect emgd branch merge
During the merge of the 3.0 BSPs forward to 3.2, a few moved config
fragments were missed.
(From OE-Core rev: 51c0c1d07d44b3bffb63d15b6befff6e7ba2549f)
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.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb index efb1bc9c3c..872289fcdb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | |||
| @@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt" | |||
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "3652b606f1ab7769a7ecc86c70d22db4ef99fb2a" | 17 | SRCREV_machine ?= "3652b606f1ab7769a7ecc86c70d22db4ef99fb2a" |
| 18 | SRCREV_machine_qemuppc ?= "0c8f5214bc15699b41369751cdecea45f717c79c" | 18 | SRCREV_machine_qemuppc ?= "0c8f5214bc15699b41369751cdecea45f717c79c" |
| 19 | SRCREV_meta ?= "fa83c7b0b47d1aa3e25594ddbcd125a1108d3aaa" | 19 | SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0" |
| 20 | 20 | ||
| 21 | PR = "r1" | 21 | PR = "r1" |
| 22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index 2d2542a945..6da16c66fc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb | |||
| @@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "74364f1062a219eb242d7cb300a404516c297601" | |||
| 23 | SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07" | 23 | SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07" |
| 24 | SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7" | 24 | SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7" |
| 25 | SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba" | 25 | SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba" |
| 26 | SRCREV_meta ?= "fa83c7b0b47d1aa3e25594ddbcd125a1108d3aaa" | 26 | SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0" |
| 27 | 27 | ||
| 28 | PR = "r1" | 28 | PR = "r1" |
| 29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |