Skip to contentSkip to conversation

fix prepare-kernel.sh for x86 build

PATCH In review Jan Kiszka 2 participants 3 messages Dec 28, 2007

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 fix prepare-kernel.sh for x86 build

scripts/prepare-kernel.sh +2 -2
Index: xenomai/scripts/prepare-kernel.sh
===================================================================
@@ -428,9 +428,9 @@
             patch_append init/Kconfig
     fi
 
-    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_arch/Makefile; then
+    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_archsrc/Makefile; then
 	p="drivers-\$(CONFIG_XENOMAI)		+= arch/$linux_archsrc/xenomai/"
-	( echo ; echo $p ) | patch_append arch/$linux_arch/Makefile
+	( echo ; echo $p ) | patch_append arch/$linux_archsrc/Makefile
     fi
 
     patch_architecture_specific="n"
#1 lore raw
Quoted 7 lines · Jan Kiszka

Index: xenomai/scripts/prepare-kernel.sh
===================================================================

scripts/prepare-kernel.sh +0 -0
@@ -428,9 +428,9 @@
             patch_append init/Kconfig

scripts/prepare-kernel.sh line 436

Quoted 10 lines
scripts/prepare-kernel.sh +2 -2
     fi
 
-    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_arch/Makefile; then
+    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_archsrc/Makefile; then
 	p="drivers-\$(CONFIG_XENOMAI)		+= arch/$linux_archsrc/xenomai/"
-	( echo ; echo $p ) | patch_append arch/$linux_arch/Makefile
+	( echo ; echo $p ) | patch_append arch/$linux_archsrc/Makefile
     fi
 
     patch_architecture_specific="n"

This won't work for newer x86 patches. Which kernel/patch combo have you been using?

Quoted 8 lines

------------------------------------------------------------------------

_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core

Signature · 1 line
Philippe.
#2 lore raw
In reply to Jan Kiszka
Quoted 8 lines · Jan Kiszka

Index: xenomai/scripts/prepare-kernel.sh
===================================================================

scripts/prepare-kernel.sh +0 -0
@@ -428,9 +428,9 @@
             patch_append init/Kconfig

scripts/prepare-kernel.sh line 436

Quoted 10 lines
scripts/prepare-kernel.sh +2 -2
     fi
 
-    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_arch/Makefile; then
+    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_archsrc/Makefile; then
 	p="drivers-\$(CONFIG_XENOMAI)		+= arch/$linux_archsrc/xenomai/"
-	( echo ; echo $p ) | patch_append arch/$linux_arch/Makefile
+	( echo ; echo $p ) | patch_append arch/$linux_archsrc/Makefile
     fi
 
     patch_architecture_specific="n"

Ok, I forgot to forward port the changes from v2.4.x. The complete fix is now merged into the trunk.

Signature · 1 line
Philippe.