diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-05-18 09:01:00 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-25 23:59:31 +0100 |
commit | 2d1c14907983ffa12dfb9f8fc70b9a695e09de25 (patch) | |
tree | 9d32c9be15936c3eff937885d38342b98ee905d3 | |
parent | e1c6f96b25367766b5c2238003d3842e80e3dfdd (diff) | |
download | poky-2d1c14907983ffa12dfb9f8fc70b9a695e09de25.tar.gz |
linux-yocto/4.1: fix gcc7 compilation and v4.1.39
Porting the mainline commit, to fix gcc7 builds:
474c90156c [give up on gcc ilog2() constant optimizations]
We also integrate the 4.1.39 -stable update to pick up additional
fixes.
(From OE-Core rev: f0effea8716faae749a7d15003647d68fa0cabf7)
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>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 20 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 21cc635bf4..d69b9ade2c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -11,13 +11,13 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "f793c71d51277bdb14d6854c8cbcc09b4f5936b4" | 14 | SRCREV_machine ?= "ec0bfadaeac24cc63fa05521c6608b79b26a5e5d" |
15 | SRCREV_meta ?= "7140ddb86e4b01529185e6d4a606001ad152b8f3" | 15 | SRCREV_meta ?= "82aa97b3ebb3cd7eec8296a7cb090dfc67c2d382" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
19 | 19 | ||
20 | LINUX_VERSION ?= "4.1.38" | 20 | LINUX_VERSION ?= "4.1.39" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index ce8aea628b..f7c969a1be 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" | |||
4 | 4 | ||
5 | require recipes-kernel/linux/linux-yocto.inc | 5 | require recipes-kernel/linux/linux-yocto.inc |
6 | 6 | ||
7 | LINUX_VERSION ?= "4.1.38" | 7 | LINUX_VERSION ?= "4.1.39" |
8 | 8 | ||
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 ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" | 12 | SRCREV_machine ?= "398d1785c6bde0085b99f00f346e199a15fbdcef" |
13 | SRCREV_meta ?= "7140ddb86e4b01529185e6d4a606001ad152b8f3" | 13 | SRCREV_meta ?= "82aa97b3ebb3cd7eec8296a7cb090dfc67c2d382" |
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_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index bf7f266ee6..c6cdcab950 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "4d2c95e78cdc7d312b7ab231ce90dce317f45df9" | 14 | SRCREV_machine_qemuarm ?= "3b0fd24797cb11aae54010b1bbc09dd2ae8a108e" |
15 | SRCREV_machine_qemuarm64 ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" | 15 | SRCREV_machine_qemuarm64 ?= "398d1785c6bde0085b99f00f346e199a15fbdcef" |
16 | SRCREV_machine_qemumips ?= "81454f95166056a253c8950980e025ee243d8074" | 16 | SRCREV_machine_qemumips ?= "7420516ff545f8ab3e2471cf08bf851744264a6a" |
17 | SRCREV_machine_qemuppc ?= "42c41e606b70fd73a202f4146c0480f5624b0a0e" | 17 | SRCREV_machine_qemuppc ?= "6952f5a70bc8a84a4c4d926cdec93e7a39878f32" |
18 | SRCREV_machine_qemux86 ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" | 18 | SRCREV_machine_qemux86 ?= "398d1785c6bde0085b99f00f346e199a15fbdcef" |
19 | SRCREV_machine_qemux86-64 ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" | 19 | SRCREV_machine_qemux86-64 ?= "398d1785c6bde0085b99f00f346e199a15fbdcef" |
20 | SRCREV_machine_qemumips64 ?= "8a481005da41f82d2a40bf8cb40334547160ab5b" | 20 | SRCREV_machine_qemumips64 ?= "59727538774860381f42bcfb6ec05fe21facd319" |
21 | SRCREV_machine ?= "2ce56d130ddff67f43ec857cc51cd347666a0078" | 21 | SRCREV_machine ?= "398d1785c6bde0085b99f00f346e199a15fbdcef" |
22 | SRCREV_meta ?= "7140ddb86e4b01529185e6d4a606001ad152b8f3" | 22 | SRCREV_meta ?= "82aa97b3ebb3cd7eec8296a7cb090dfc67c2d382" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
26 | 26 | ||
27 | LINUX_VERSION ?= "4.1.38" | 27 | LINUX_VERSION ?= "4.1.39" |
28 | 28 | ||
29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |
30 | 30 | ||