summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-08-20 00:30:35 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-23 17:44:34 +0100
commit1bb1200a93c7e58e900f396ba718ccf84c7ecfa0 (patch)
tree7a43811716f850cc9bc841bfd530497bd79f1be4 /meta
parent4b80b346a7de5f104af80881482240eff886c62e (diff)
downloadpoky-1bb1200a93c7e58e900f396ba718ccf84c7ecfa0.tar.gz
linux-yocto/4.4: fix configuration warnings
Integrating the following commits to address configuration warnings for intel-corei7-64 and intel-core2-32: features: Fix dependencies and =m vs =y discrepancies for corei7 intel-core2-32.cfg: Explicitly disable CONFIG_64BIT (From OE-Core rev: b2a4e07390834fa41fe35d1124ac2a0cd6692524) Signed-off-by: California Sullivan <california.l.sullivan@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_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
index dc6bb9af9f..9b0a44b791 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "9135adcfb01432abe4a95a50fca5d0395239f798" 14SRCREV_machine ?= "9135adcfb01432abe4a95a50fca5d0395239f798"
15SRCREV_meta ?= "dab902b4cfa932810bb1dc6de003ed668f935729" 15SRCREV_meta ?= "6a12efcabe8d48e323afd277fa672eae9b7e12c2"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index eb35d299df..114bd746d6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" 12SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
13SRCREV_meta ?= "dab902b4cfa932810bb1dc6de003ed668f935729" 13SRCREV_meta ?= "6a12efcabe8d48e323afd277fa672eae9b7e12c2"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index 2ec62e7fd6..f45007a361 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
19SRCREV_machine_qemux86-64 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" 19SRCREV_machine_qemux86-64 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
20SRCREV_machine_qemumips64 ?= "aa125473aef74e7731b14f6b56c1b50589fcd668" 20SRCREV_machine_qemumips64 ?= "aa125473aef74e7731b14f6b56c1b50589fcd668"
21SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" 21SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525"
22SRCREV_meta ?= "dab902b4cfa932810bb1dc6de003ed668f935729" 22SRCREV_meta ?= "6a12efcabe8d48e323afd277fa672eae9b7e12c2"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}"