aboutsummaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-03-02 16:36:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-02 22:05:02 +0000
commit4dc9bde20602c7565979c7ebdea1a36c7ab3f458 (patch)
tree9103b3ad58dcc75fa2fad977dcaf8fc86198a151 /meta
parent779f92454218ae3758f0768763df3b183a6c724a (diff)
downloadopenembedded-core-4dc9bde20602c7565979c7ebdea1a36c7ab3f458.zip
openembedded-core-4dc9bde20602c7565979c7ebdea1a36c7ab3f458.tar.gz
openembedded-core-4dc9bde20602c7565979c7ebdea1a36c7ab3f458.tar.bz2
linux-yocto: fix qemux86-64 config warning
During the 3.19 update a 32 bit option in the 64 bit config was missed, which results in the option being dropped (and reported as a warning): Value requested for CONFIG_PCI_GOANY not in final ".config" Requested value: "CONFIG_PCI_GOANY=y" Actual value set: "" So we split the 32bit only drivers out of the common driver include and the problem goes away. [YOCTO: 7354] 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-tiny_3.19.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.19.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index dba163e..1997e30 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.19"
KMETA = "meta"
SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711"
-SRCREV_meta ?= "8897ef68b30e7426bc1d39895e71fb155d694974"
+SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 044ee7f..f856d19 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "43b9eced9ba8a57add36af07736344dcc383f711"
SRCREV_machine_qemux86-64 ?= "43b9eced9ba8a57add36af07736344dcc383f711"
SRCREV_machine_qemumips64 ?= "b7ab9d4bac55415f125c81f529dbbefb07de98ad"
SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711"
-SRCREV_meta ?= "8897ef68b30e7426bc1d39895e71fb155d694974"
+SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"