diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-08-20 16:24:56 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:36:04 +0100 |
commit | d1d3b6466a59eee67ccc4588712b39c160affaf7 (patch) | |
tree | cab28f383c25bec3207df6bb1a7f28357f176a9a /meta | |
parent | ad4ab1b3926beced08ac2f87359da5047b87c052 (diff) | |
download | poky-d1d3b6466a59eee67ccc4588712b39c160affaf7.tar.gz |
linux-yocto/3.14: cleanups and gcc5 ARM build fixes
Updating the 3.14 SRCREVs to match the latest kernel meta data updates
and also to merge four patches Richard Purdie located that fix the
gcc 5.x ARM build (we still have boot issues, but building is the
first step).
(From OE-Core rev: 24a888ddd04e44f8a069364bfbde06871ad33ae8)
(From OE-Core rev: b9509a02c4dae0fabbba730d3311bca29e353e4f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.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.14.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.14.bb | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index 0bd94f0c60..d59f06b81c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | |||
@@ -3,9 +3,9 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" | |||
3 | 3 | ||
4 | require recipes-kernel/linux/linux-yocto.inc | 4 | require recipes-kernel/linux/linux-yocto.inc |
5 | 5 | ||
6 | SRCREV_machine ?= "863ba0912f559ba9d64ab94bf04f0226fdf0cb49" | 6 | SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" |
7 | SRCREV_machine_qemuppc ?= "9d464d6696a0fc755c65a2cf75ad7a4656ac6e1e" | 7 | SRCREV_machine_qemuppc ?= "e4847afbb42583fa05e6a94c8d0c8f8e37ed5622" |
8 | SRCREV_meta ?= "b55cfc0308bf7158843db4b8f69f866487a0919e" | 8 | SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b" |
9 | 9 | ||
10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine \ | 10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine \ |
11 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" | 11 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb index f486d41efa..f65e0e0ed7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.14.36" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "7534aeb01883b48cc42eb4900d0a8c64e8160e14" | 12 | SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" |
13 | SRCREV_meta ?= "b55cfc0308bf7158843db4b8f69f866487a0919e" | 13 | SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b" |
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.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index 9bbcecc76f..db77e9ead0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" | 11 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "bc2e4081f235174c696cc4b30dbea51555a1c3d6" | 14 | SRCREV_machine_qemuarm ?= "7e763688134a64b67f35af4f5a289be0b0c95126" |
15 | SRCREV_machine_qemuarm64 ?= "7534aeb01883b48cc42eb4900d0a8c64e8160e14" | 15 | SRCREV_machine_qemuarm64 ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" |
16 | SRCREV_machine_qemumips ?= "cbbe5f1b5477507aa668b4117a8dedcb407a0571" | 16 | SRCREV_machine_qemumips ?= "9c6fdae47597756042a1d4ed613dff96e430e8e9" |
17 | SRCREV_machine_qemuppc ?= "038bbef0f64321a0f9d77e9b07dff3ae1e51b51a" | 17 | SRCREV_machine_qemuppc ?= "e4847afbb42583fa05e6a94c8d0c8f8e37ed5622" |
18 | SRCREV_machine_qemux86 ?= "48833301518748d82cbc2412fea3617eeee6d01b" | 18 | SRCREV_machine_qemux86 ?= "550f5379bc4b001f656e7c98165606e543d0858c" |
19 | SRCREV_machine_qemux86-64 ?= "7534aeb01883b48cc42eb4900d0a8c64e8160e14" | 19 | SRCREV_machine_qemux86-64 ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" |
20 | SRCREV_machine_qemumips64 ?= "c910c6d8338ab7291f066edc06de83de5b645d8f" | 20 | SRCREV_machine_qemumips64 ?= "9b203f1aff41f7b713ec973cdcc7d016db4ffc26" |
21 | SRCREV_machine ?= "7534aeb01883b48cc42eb4900d0a8c64e8160e14" | 21 | SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" |
22 | SRCREV_meta ?= "b55cfc0308bf7158843db4b8f69f866487a0919e" | 22 | SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}" |