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-03-26 18:50:17 +0100
commit2cf5280cd46dd18235911317247529fe8432214b (patch)
tree9132fff8c52c1f7472705487dc1fa7073d71f3eb /meta/recipes-kernel
parent106bb63801fc102398b6fea58aa5c3862ad111c0 (diff)
downloadpoky-2cf5280cd46dd18235911317247529fe8432214b.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: 70419f281a4571d01975bd79a47a6ed7ae70b1ae) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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 683f182c43..ab965272d9 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -330,6 +330,13 @@ do_install() {
330 # external modules can be built 330 # external modules can be built
331 touch -r $kerneldir/build/Makefile $kerneldir/build/include/generated/uapi/linux/version.h 331 touch -r $kerneldir/build/Makefile $kerneldir/build/include/generated/uapi/linux/version.h
332 332
333 # This fixes a warning that the compilers don't match when building a module
334 # Change: CONFIG_CC_VERSION_TEXT="x86_64-poky-linux-gcc (GCC) 12.2.0" to "gcc (GCC) 12.2.0"
335 # #define CONFIG_CC_VERSION_TEXT "x86_64-poky-linux-gcc (GCC) 12.2.0" to "gcc (GCC) 12.2.0"
336 sed -i 's/CONFIG_CC_VERSION_TEXT=".*\(gcc.*\)"/CONFIG_CC_VERSION_TEXT="\1"/' "$kerneldir/build/.config"
337 sed -i 's/#define CONFIG_CC_VERSION_TEXT ".*\(gcc.*\)"/#define CONFIG_CC_VERSION_TEXT "\1"/' $kerneldir/build/include/generated/autoconf.h
338 sed -i 's/CONFIG_CC_VERSION_TEXT=".*\(gcc.*\)"/CONFIG_CC_VERSION_TEXT="\1"/' $kerneldir/build/include/config/auto.conf
339
333 # make sure these are at least as old as the .config, or rebuilds will trigger 340 # make sure these are at least as old as the .config, or rebuilds will trigger
334 touch -r $kerneldir/build/.config $kerneldir/build/include/generated/autoconf.h 2>/dev/null || : 341 touch -r $kerneldir/build/.config $kerneldir/build/include/generated/autoconf.h 2>/dev/null || :
335 touch -r $kerneldir/build/.config $kerneldir/build/include/config/auto.conf* 2>/dev/null || : 342 touch -r $kerneldir/build/.config $kerneldir/build/include/config/auto.conf* 2>/dev/null || :