summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-03-19 14:58:37 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-20 18:54:57 +0000
commitea8f03e2798de0b8bce8e58b1ee5543f456d9f98 (patch)
treecbe5bec606c8ad2ed658c93283ddbe3e130a922c
parent0ffb5a8a49ba2e0438f46d1083f7a58d088bc153 (diff)
downloadpoky-contrib-ea8f03e2798de0b8bce8e58b1ee5543f456d9f98.tar.gz
poky-contrib-ea8f03e2798de0b8bce8e58b1ee5543f456d9f98.tar.bz2
poky-contrib-ea8f03e2798de0b8bce8e58b1ee5543f456d9f98.zip
kernel-devsrc: fix on-target scripts/prepare for v5.12+
AR is now captured are part of the build environment. If we don't subtitute our on-target variant for the cross version, we'll end up getting a prompted configure when preparing to build modules. (From OE-Core rev: 09bf40bf890a9d56c8365eb93a4baf467dc3308c) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index dadeade3aa..455c836527 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -271,6 +271,7 @@ do_install() {
if [ -e "$kerneldir/build/include/config/auto.conf.cmd" ]; then
sed -i 's/ifneq "$(CC)" ".*-linux-.*gcc.*$/ifneq "$(CC)" "gcc"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(LD)" ".*-linux-.*ld.bfd.*$/ifneq "$(LD)" "ld"/' "$kerneldir/build/include/config/auto.conf.cmd"
+ sed -i 's/ifneq "$(AR)" ".*-linux-.*ar.*$/ifneq "$(AR)" "ar"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(HOSTCXX)" ".*$/ifneq "$(HOSTCXX)" "g++"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(HOSTCC)" ".*$/ifneq "$(HOSTCC)" "gcc"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(CC_VERSION_TEXT)".*\(gcc.*\)"/ifneq "$(CC_VERSION_TEXT)" "\1"/' "$kerneldir/build/include/config/auto.conf.cmd"