Skip to contentSkip to conversation

debian/prepare-patch

PATCH New Paul 1 participant 1 message Feb 21, 2009

lore
Share & tools
lore

Paul

author
#0 lore raw

PATCH 1/1 debian/prepare-patch

Now that Debian has gone "stable" with Lenny, I've been updating some of my local repositories - The current debian/rule set produces a horribly broken patch for 2.6.28 (on x86), and probably other kernels. The attached patch goes some way to resolving this problem for trunk and probably needs to be applied to the v2.4.x branch so that it can be picke up by the Debian team.

Regards, Paul.

prepare-patch.sh +4 -5
Index: debian/prepare-patch.sh
===================================================================
@@ -74,12 +74,11 @@ generate_patch() {
 }
 
 diff_addons() {
-    lines=`(echo ; echo ; cat $xenomai_root/scripts/Kconfig.frag) | wc -l`
+    lines=`cat $xenomai_root/scripts/Kconfig.frag | wc -l`
 
-    echo "--- linux/arch/$linux_arch/Kconfig	1970-01-01 01:00:00.000000000 +0100" >> $patch_file
-    echo "+++ linux-patched/arch/$linux_arch/Kconfig	2007-03-06 17:55:58.000000000 +0000" >> $patch_file
-    echo "@@ -40,2 +40,$lines @@" >> $patch_file
-    echo " source \"init/Kconfig\"" >> $patch_file
+    echo "--- linux/init/Kconfig	1970-01-01 01:00:00.000000000 +0100" >> $patch_file
+    echo "+++ linux-patched/init/Kconfig	2007-03-06 17:55:58.000000000 +0000" >> $patch_file
+    echo "@@ -950,0 +950,$lines @@" >> $patch_file
     sed -e "s,@LINUX_ARCH@,$linux_arch,g" $xenomai_root/scripts/Kconfig.frag | sed 's/^/+/' >> $patch_file
     echo " " >> $patch_file
 }