diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-06-11 12:11:22 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-12 23:34:24 +0100 |
commit | 5da0114973b5e3ead065369aba16c1a53bd6e705 (patch) | |
tree | c4f32ebc2385c8cc1ae53a189686625f8345e9ee /meta/recipes-kernel | |
parent | 0c66724b71b26d78fc22c70306f0fbc8bc12809b (diff) | |
download | poky-5da0114973b5e3ead065369aba16c1a53bd6e705.tar.gz |
linux-yocto/4.14/4.15: fix gcc8 mips compilation issues
Making the following commit available to fix mips gcc8 build issues:
commit e25dbfe95302eeaa1a03a828d05c09479574488a
Author: Kevin Hao <kexin.hao@windriver.com>
Date: Mon Jun 11 18:17:54 2018 +0800
MIPS: Use '+=" instead of '=' to avoid the CFLAGS override
We used the CFLAGS_xxx to workaround the gcc 8 build warnings
for some specific file. But CFLAGS_xxx is also used with '=' in
other places of this Makefile. This override the gcc 8 workaround,
so replace all the '=' with '+=" to fix this issue.
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
(From OE-Core rev: 8ab5b439ea82ac775494a0ce7a6f3615b61c94be)
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
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_4.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.14.bb | 16 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.15.bb | 16 |
6 files changed, 20 insertions, 20 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index dc09b90880..00671182d1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | |||
@@ -11,7 +11,7 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "f8ced9d2648cffbb6ce6222bb453540422eb19f2" | 14 | SRCREV_machine ?= "aeeb2d73f2a828a9c0b121b2aa3bb345009f5698" |
15 | SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" | 15 | SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index 7cec80e02d..d166a4098b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | |||
@@ -11,7 +11,7 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 14 | SRCREV_machine ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
15 | SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" | 15 | SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index 2f48bc67de..58945f25d0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | |||
@@ -12,7 +12,7 @@ DEPENDS += "openssl-native util-linux-native" | |||
12 | KMETA = "kernel-meta" | 12 | KMETA = "kernel-meta" |
13 | KCONF_BSP_AUDIT_LEVEL = "2" | 13 | KCONF_BSP_AUDIT_LEVEL = "2" |
14 | 14 | ||
15 | SRCREV_machine ?= "72fa684fc18637c6b385c8fa2335ac4e48240d15" | 15 | SRCREV_machine ?= "9e246607d5c23f8bb3b8800734b1707766e0b2b9" |
16 | SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" | 16 | SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" |
17 | 17 | ||
18 | PV = "${LINUX_VERSION}+git${SRCPV}" | 18 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb index 05b076af6c..5f9b3c7fb3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | |||
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.15.18" | |||
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 ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 12 | SRCREV_machine ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
13 | SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" | 13 | SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index 12cd8254e0..0449213d42 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb | |||
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "v4.14/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v4.14/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v4.14/standard/base" |
12 | KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "3a7b21b8959eaeb6b3548ccc03e5aeef02757a83" | 14 | SRCREV_machine_qemuarm ?= "363723ef50c06df54e146c8fe78faa962e96a8c8" |
15 | SRCREV_machine_qemuarm64 ?= "fff23f8dabf7774db37656037243f5706f311ccd" | 15 | SRCREV_machine_qemuarm64 ?= "798d15552a4d5d9355a300290ed6bf72106b7e96" |
16 | SRCREV_machine_qemumips ?= "825a9302d4829384c5f8ccdf96a71f39441095dd" | 16 | SRCREV_machine_qemumips ?= "6c2433d7c51c3e78b1be2c7d1fbfe840b13d04df" |
17 | SRCREV_machine_qemuppc ?= "24febbcbc2cefbf05ea038ed1042603142d3b033" | 17 | SRCREV_machine_qemuppc ?= "c03babad17499489b20216576d608c94e7fddc5d" |
18 | SRCREV_machine_qemux86 ?= "2bf00ed1aee9c26b48c26b10c731c2f8970d50c2" | 18 | SRCREV_machine_qemux86 ?= "65d1c849534179bbfa494f77947f8be615e9871a" |
19 | SRCREV_machine_qemux86-64 ?= "2bf00ed1aee9c26b48c26b10c731c2f8970d50c2" | 19 | SRCREV_machine_qemux86-64 ?= "65d1c849534179bbfa494f77947f8be615e9871a" |
20 | SRCREV_machine_qemumips64 ?= "a55b95ebad77a4124d5f52a6d121d59e17647289" | 20 | SRCREV_machine_qemumips64 ?= "59f70381cbde371e41206b7902390ae78558c310" |
21 | SRCREV_machine ?= "2bf00ed1aee9c26b48c26b10c731c2f8970d50c2" | 21 | SRCREV_machine ?= "65d1c849534179bbfa494f77947f8be615e9871a" |
22 | SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" | 22 | SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.15.bb b/meta/recipes-kernel/linux/linux-yocto_4.15.bb index 6e708550fa..693670c613 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.15.bb | |||
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "v4.15/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v4.15/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v4.15/standard/base" |
12 | KBRANCH_qemumips64 ?= "v4.15/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v4.15/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "2e7f1aeb11d0aedec2ba2ce995933221a0bfddeb" | 14 | SRCREV_machine_qemuarm ?= "d16b10fb69974f1804a02f2678f40d22c80526cf" |
15 | SRCREV_machine_qemuarm64 ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 15 | SRCREV_machine_qemuarm64 ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
16 | SRCREV_machine_qemumips ?= "43122d3a461b6216ca1a4a568378eea8143cf927" | 16 | SRCREV_machine_qemumips ?= "182eaefab712f4360126e044c758e75d763d05c4" |
17 | SRCREV_machine_qemuppc ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 17 | SRCREV_machine_qemuppc ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
18 | SRCREV_machine_qemux86 ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 18 | SRCREV_machine_qemux86 ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
19 | SRCREV_machine_qemux86-64 ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 19 | SRCREV_machine_qemux86-64 ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
20 | SRCREV_machine_qemumips64 ?= "4cc6d70306ff8bd235008d18adee0bc676dc2798" | 20 | SRCREV_machine_qemumips64 ?= "ce3876a091477260fcb1197e3c6565dfbf9c6e80" |
21 | SRCREV_machine ?= "683cfd2540fcb659774458352e8fb121ec764e0e" | 21 | SRCREV_machine ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" |
22 | SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" | 22 | SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |