[PATCH v2 04/10] kernel: cobalt: forward SRCARCH from the scripts/prepare-kernel.sh

roman.stratiienko at globallogic.com roman.stratiienko at globallogic.com
Wed Mar 6 18:53:25 CET 2019


From: Roman Stratiienko <roman.stratiienko at globallogic.com>

$SRCARCH removed since v4.18-rc1, upstream commit 104daea149c4
("kconfig: reference environment variables directly and remove 'option env='")

This will fix build with v4.18

Signed-off-by: Roman Stratiienko <roman.stratiienko at globallogic.com>
---
 scripts/Kconfig.frag      | 2 +-
 scripts/prepare-kernel.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/Kconfig.frag b/scripts/Kconfig.frag
index cd39f7670..c9655d43a 100644
--- a/scripts/Kconfig.frag
+++ b/scripts/Kconfig.frag
@@ -16,7 +16,7 @@ menuconfig XENOMAI
 	  Please visit http://xenomai.org for more information.
 
 if XENOMAI
-source "arch/$SRCARCH/xenomai/Kconfig"
+source "arch/@SRCARCH@/xenomai/Kconfig"
 endif
 
 if MIGRATION
diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 964e42e83..8707b1198 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -376,6 +376,7 @@ case $linux_VERSION.$linux_PATCHLEVEL in
 	    -e "s, at VERSION_MINOR@,$version_minor,g" \
 	    -e "s, at REVISION_LEVEL@,$revision_level,g" \
 	    -e "s, at VERSION_STRING@,$version_string,g" \
+	    -e "s, at SRCARCH@,$linux_arch,g" \
 	    $xenomai_root/scripts/Kconfig.frag |
             patch_append init/Kconfig
     fi
-- 
2.17.1




More information about the Xenomai mailing list