r1592 - trunk/kernel/s390/2.6.8/debian

[Bastian Blank]

Author: waldi
Date: 2004-09-15 08:53:48 -0600 (Wed, 15 Sep 2004)
New Revision: 1592

Modified:
   trunk/kernel/s390/2.6.8/debian/rules
Log:
debian/rules: Cleanup patch generation.


Modified: trunk/kernel/s390/2.6.8/debian/rules
===================================================================
--- trunk/kernel/s390/2.6.8/debian/rules	2004-09-15 14:52:17 UTC (rev 1591)
+++ trunk/kernel/s390/2.6.8/debian/rules	2004-09-15 14:53:48 UTC (rev 1592)
@@ -21,6 +21,7 @@
 	dh_testdir
 	
 	tar -jxf /usr/src/kernel-source-$(version).tar.bz2
+	cd kernel-source-$(version); /usr/src/kernel-patches/all/$(version)/apply/debian $(kernel_tree_version)
 
 	touch $@
 
@@ -29,17 +30,17 @@
 	dh_testdir
 
 	@-rm -rf patch*
-	cd kernel-source-$(version); /usr/src/kernel-patches/all/$(version)/apply/debian $(kernel_tree_version)
-	cp -al kernel-source-$(version) patch
-	cp -al kernel-source-$(version) patch.orig
+	mkdir patch
+	cp -al kernel-source-$(version) patch/kernel-source-$(version)
+	cp -al kernel-source-$(version) patch/kernel-source-$(version).orig
 
-	@cd patch;                                      \
+	@cd patch/kernel-source-$(version);             \
 	  for patch in $(wildcard diffs/*.diff); do     \
 	  echo "Applying patch $$patch ...";            \
-	  patch --no-backup-if-mismatch -p0 < ../$$patch || exit 1;        \
+	  patch --no-backup-if-mismatch -p0 < ../../$$patch || exit 1;        \
 	done
 
-	-diff -urN patch.orig patch > linux-$(version)-s390.debian.diff
+	-cd patch; diff -urN kernel-source-$(version).orig kernel-source-$(version) > ../linux-$(version)-s390.debian.diff
 
 	touch $@