Module: xenomai-jki
Branch: for-forge
Commit: 36c6975e231a92b25193129efb2a52c2af9d8674
URL:    
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=36c6975e231a92b25193129efb2a52c2af9d8674

Author: Jan Kiszka <jan.kis...@siemens.com>
Date:   Thu Dec 11 12:58:10 2014 +0100

build: Remove arch patching from Kconfig.frag

No need to patch this in during kernel preparation time. By using $ARCH,
the same kernel source tree can be used for building multiple
architectures.

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 scripts/Kconfig.frag      |    2 +-
 scripts/prepare-kernel.sh |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/Kconfig.frag b/scripts/Kconfig.frag
index 8219432..b80d2a9 100644
--- a/scripts/Kconfig.frag
+++ b/scripts/Kconfig.frag
@@ -15,7 +15,7 @@ menuconfig XENOMAI
          Please visit http://xenomai.org for more information.
 
 if XENOMAI
-source "arch/@LINUX_ARCH@/xenomai/Kconfig"
+source "arch/$ARCH/xenomai/Kconfig"
 endif
 
 if APM || CPU_FREQ || ACPI_PROCESSOR || INTEL_IDLE
diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 23dec84..d0d62da 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -391,8 +391,7 @@ case $linux_VERSION.$linux_PATCHLEVEL in
        revision_level=`expr $version_stamp : 
'[[0-9]]*\.[[0-9]*]*\.\([[0-9]*]*\)' || true`
        version_string=`cat $xenomai_root/config/version-label`
        version_name=`cat $xenomai_root/config/version-name`
-       sed -e "s,@LINUX_ARCH@,$linux_arch,g" \
-           -e "s,@VERSION_MAJOR@,$version_major,g" \
+       sed -e "s,@VERSION_MAJOR@,$version_major,g" \
            -e "s,@VERSION_MINOR@,$version_minor,g" \
            -e "s,@REVISION_LEVEL@,$revision_level,g" \
            -e "s,@VERSION_STRING@,$version_string,g" \


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to