summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-03-24 11:08:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-04 17:46:24 +0100
commitdbaac8ff1c06b46d4cfd6b4525e978f3e2f77141 (patch)
tree36a5cd0bfea378441b85e3f9b9ae1c51deac066a /meta/recipes-kernel
parent97334413f44b9e003e7b69106680ce9e856c4915 (diff)
downloadpoky-dbaac8ff1c06b46d4cfd6b4525e978f3e2f77141.tar.gz
kernel-devsrc: fix mismatched compiler warning
When building a module on target, we use the native compiler (always "gcc") versus the same compiler, but named in a cross compiler manner, for the kernel build. The kernel captures the compiler string in several places, some of which we are already fixing, but others we are not (as they don't cause issues). But when building an on target module, the main kernel Makefile compares compiler strings and outputs a warning similar to: warning: the compiler differs from the one used to build the kernel The kernel was built by: x86_64-poky-linux-gcc (GCC) 11.3.0 You are using: gcc (GCC) 11.3.0 We drop the cross compilation prefix from the captured compiler string, and we avoid the warning. RP: tweaked one sed expression to fix quoting issue with 5.15 (From OE-Core rev: a122e5b914d59ceaa10ddb66e8611c31f0fb958d) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 70419f281a4571d01975bd79a47a6ed7ae70b1ae) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 46d706b955..17ae744d0d 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -308,6 +308,13 @@ do_install() {
308 # external modules can be built 308 # external modules can be built
309 touch -r $kerneldir/build/Makefile $kerneldir/build/include/generated/uapi/linux/version.h 309 touch -r $kerneldir/build/Makefile $kerneldir/build/include/generated/uapi/linux/version.h
310 310
311 # This fixes a warning that the compilers don't match when building a module
312 # Change: CONFIG_CC_VERSION_TEXT="x86_64-poky-linux-gcc (GCC) 12.2.0" to "gcc (GCC) 12.2.0"
313 # #define CONFIG_CC_VERSION_TEXT "x86_64-poky-linux-gcc (GCC) 12.2.0" to "gcc (GCC) 12.2.0"
314 sed -i 's/CONFIG_CC_VERSION_TEXT=".*\(gcc.*\)"/CONFIG_CC_VERSION_TEXT="\1"/' "$kerneldir/build/.config"
315 sed -i 's/#define CONFIG_CC_VERSION_TEXT ".*\(gcc.*\)"/#define CONFIG_CC_VERSION_TEXT "\1"/' $kerneldir/build/include/generated/autoconf.h
316 sed -i 's/CONFIG_CC_VERSION_TEXT=".*\(gcc.*\)"/CONFIG_CC_VERSION_TEXT="\1"/' $kerneldir/build/include/config/auto.conf
317
311 # make sure these are at least as old as the .config, or rebuilds will trigger 318 # make sure these are at least as old as the .config, or rebuilds will trigger
312 touch -r $kerneldir/build/.config $kerneldir/build/include/generated/autoconf.h 2>/dev/null || : 319 touch -r $kerneldir/build/.config $kerneldir/build/include/generated/autoconf.h 2>/dev/null || :
313 touch -r $kerneldir/build/.config $kerneldir/build/include/config/auto.conf* 2>/dev/null || : 320 touch -r $kerneldir/build/.config $kerneldir/build/include/config/auto.conf* 2>/dev/null || :