prepare-kernel: get rid of arch_makefile

PATCH New Jan Kiszka 1 participant 1 message Dec 29, 2007

Share & tools

Jan Kiszka

author

2007-12-29 20:33 UTC #0 lore raw

PATCH 1/1 prepare-kernel: get rid of arch_makefile

For me there appears to be neither a need for nor a benefit of patching the sub-arch Makefile instead of the top one. The big drawback is that you have to re-prepare the kernel when you switch between 32 and 64-bit mode at .config level. So let's kill this special case.

Jan

scripts/prepare-kernel.sh +2 -5

Index: xenomai/scripts/prepare-kernel.sh
===================================================================
@@ -334,14 +334,11 @@
    fi
 done
 
-arch_makefile=Makefile
-
 # i386 and x86_64 architectures are merged since 2.6.24. The resulting
 # combo is available from arch/x86 when present.
 if test "$xenomai_arch" = x86; then
   if test -d $linux_tree/arch/x86; then
       linux_arch=x86
-      arch_makefile=Makefile_$x86_arch_bits
   fi
 fi

@@ -433,9 +430,9 @@
             patch_append init/Kconfig
     fi
 
-    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_arch/$arch_makefile; then
+    if ! grep -q CONFIG_XENOMAI $linux_tree/arch/$linux_arch/Makefile; then
 	p="drivers-\$(CONFIG_XENOMAI)		+= arch/$linux_arch/xenomai/"
-	( echo ; echo $p ) | patch_append arch/$linux_arch/$arch_makefile
+	( echo ; echo $p ) | patch_append arch/$linux_arch/Makefile
     fi
 
     patch_architecture_specific="n"