[Pkg-uml-commit] r161 - in trunk/src/kernel-patch-skas/debian: . patches

[Mattia Dongili]

Author: malattia
Date: 2006-08-26 18:48:09 +0000 (Sat, 26 Aug 2006)
New Revision: 161

Added:
   trunk/src/kernel-patch-skas/debian/patches/
   trunk/src/kernel-patch-skas/debian/patches/series
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.10-v8.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.11-v8.2.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.12-v9-pre7.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.13-rc7-v9-pre7.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.14-v9-pre7.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.15-v9-pre8.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.16-v9-pre9.patch.diff
   trunk/src/kernel-patch-skas/debian/patches/skas-2.6.17-rc5-v9-pre9.patch.diff
Modified:
   trunk/src/kernel-patch-skas/debian/rules
Log:
infrastructure (and patches too) to remove the *localversion* hunk that breaks make-kpkg

Added: trunk/src/kernel-patch-skas/debian/patches/series
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/series	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/series	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,8 @@
+skas-2.6.10-v8.patch.diff
+skas-2.6.11-v8.2.patch.diff
+skas-2.6.12-v9-pre7.patch.diff
+skas-2.6.13-rc7-v9-pre7.patch.diff
+skas-2.6.14-v9-pre7.patch.diff
+skas-2.6.15-v9-pre8.patch.diff
+skas-2.6.16-v9-pre9.patch.diff
+skas-2.6.17-rc5-v9-pre9.patch.diff

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.10-v8.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.10-v8.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.10-v8.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,10 @@
+--- ./skas-2.6.10-v8.patch.orig	2006-08-26 20:18:13.080839320 +0200
++++ ./skas-2.6.10-v8.patch	2006-08-26 20:20:59.826341605 +0200
+@@ -947,7 +947,3 @@
+  
+  		if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
+  			/* We were in lazy tlb mode and leave_mm disabled 
+---- /dev/null	2005-03-26 18:29:00.701330288 +0100
+-+++ clean-linux-2.6.10-paolo/localversion-skas	2005-03-29 16:00:28.000000000 +0200
+-@@ -0,0 +1 @@
+-+-skas3-v8

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.11-v8.2.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.11-v8.2.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.11-v8.2.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,10 @@
+--- ./skas-2.6.11-v8.2.patch.orig	2006-08-26 20:21:27.347909969 +0200
++++ ./skas-2.6.11-v8.2.patch	2006-08-26 20:21:13.959146987 +0200
+@@ -940,7 +940,3 @@
+  
+  		if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
+  			/* We were in lazy tlb mode and leave_mm disabled 
+---- clean-linux-2.6.11-paolo/localversion-skas	2005-07-10 16:56:52.000000000 +0200
+-+++ clean-linux-2.6.11-paolo/localversion-skas	2005-07-11 11:36:04.000000000 +0200
+-@@ -0,0 +1 @@
+-+-skas3-v8.2

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.12-v9-pre7.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.12-v9-pre7.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.12-v9-pre7.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,13 @@
+--- ./skas-2.6.12-v9-pre7.patch.orig	2006-08-26 20:18:13.088839776 +0200
++++ ./skas-2.6.12-v9-pre7.patch	2006-08-26 20:21:42.148753421 +0200
+@@ -1159,10 +1159,6 @@
+  
+  		if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
+  			/* We were in lazy tlb mode and leave_mm disabled 
+---- vanilla-linux-2.6.12-paolo/localversion-skas	2005-07-10 11:36:59.000000000 +0200
+-+++ vanilla-linux-2.6.12-paolo/localversion-skas	2005-07-11 11:51:53.000000000 +0200
+-@@ -0,0 +1 @@
+-+-skas3-v9-pre7
+ --- linux-2.6.git-paolo/arch/x86_64/mm/proc_mm.c	2005-06-02 05:03:04.000000000 +0200
+ +++ linux-2.6.git-paolo/arch/x86_64/mm/proc_mm.c	2005-05-15 18:32:11.000000000 +0200
+ @@ -0,0 +1,85 @@

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.13-rc7-v9-pre7.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.13-rc7-v9-pre7.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.13-rc7-v9-pre7.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,13 @@
+--- ./skas-2.6.13-rc7-v9-pre7.patch.orig	2006-08-26 20:18:13.092840004 +0200
++++ ./skas-2.6.13-rc7-v9-pre7.patch	2006-08-26 20:21:51.981313747 +0200
+@@ -1164,10 +1164,6 @@
+  
+  		if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
+  			/* We were in lazy tlb mode and leave_mm disabled 
+---- linux-2.6.git-broken-paolo/localversion-skas	2005-07-13 19:30:11.000000000 +0200
+-+++ linux-2.6.git-broken-paolo/localversion-skas	2005-07-13 19:30:14.000000000 +0200
+-@@ -0,0 +1 @@
+-+-skas3-v9-pre7
+ --- linux-2.6.git-paolo/arch/x86_64/mm/proc_mm.c	2005-07-31 18:56:20.000000000 +0200
+ +++ linux-2.6.git-paolo/arch/x86_64/mm/proc_mm.c	2005-05-15 18:32:11.000000000 +0200
+ @@ -0,0 +1,85 @@

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.14-v9-pre7.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.14-v9-pre7.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.14-v9-pre7.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,15 @@
+--- ./skas-2.6.14-v9-pre7.patch.orig	2006-08-26 20:18:13.100840460 +0200
++++ ./skas-2.6.14-v9-pre7.patch	2006-08-26 20:22:03.237955227 +0200
+@@ -1417,12 +1417,6 @@
+ +#endif
+ +
+ +#endif
+-Index: linux-2.6.14/localversion-skas
+-===================================================================
+---- /dev/null	1970-01-01 00:00:00.000000000 +0000
+-+++ linux-2.6.14/localversion-skas	2005-10-29 05:50:35.000000000 +0200
+-@@ -0,0 +1 @@
+-+-skas3-v9-pre7
+ Index: linux-2.6.14/mm/Makefile
+ ===================================================================
+ --- linux-2.6.14.orig/mm/Makefile	2005-10-29 05:49:32.000000000 +0200

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.15-v9-pre8.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.15-v9-pre8.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.15-v9-pre8.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,15 @@
+--- ./skas-2.6.15-v9-pre8.patch.orig	2006-08-26 20:18:13.104840688 +0200
++++ ./skas-2.6.15-v9-pre8.patch	2006-08-26 20:22:10.926393366 +0200
+@@ -1403,12 +1403,6 @@
+ +#endif
+ +
+ +#endif
+-Index: linux-2.6.15/localversion-skas
+-===================================================================
+---- /dev/null
+-+++ linux-2.6.15/localversion-skas
+-@@ -0,0 +1 @@
+-+-skas3-v9-pre8
+ Index: linux-2.6.15/mm/Makefile
+ ===================================================================
+ --- linux-2.6.15.orig/mm/Makefile

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.16-v9-pre9.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.16-v9-pre9.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.16-v9-pre9.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,15 @@
+--- ./skas-2.6.16-v9-pre9.patch.orig	2006-08-26 20:18:13.108840916 +0200
++++ ./skas-2.6.16-v9-pre9.patch	2006-08-26 20:22:26.951306573 +0200
+@@ -1389,12 +1389,6 @@
+ +#endif
+ +
+ +#endif
+-Index: linux-2.6.16/localversion-skas
+-===================================================================
+---- /dev/null
+-+++ linux-2.6.16/localversion-skas
+-@@ -0,0 +1 @@
+-+-skas3-v9-pre9
+ Index: linux-2.6.16/mm/Makefile
+ ===================================================================
+ --- linux-2.6.16.orig/mm/Makefile

Added: trunk/src/kernel-patch-skas/debian/patches/skas-2.6.17-rc5-v9-pre9.patch.diff
===================================================================
--- trunk/src/kernel-patch-skas/debian/patches/skas-2.6.17-rc5-v9-pre9.patch.diff	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/patches/skas-2.6.17-rc5-v9-pre9.patch.diff	2006-08-26 18:48:09 UTC (rev 161)
@@ -0,0 +1,15 @@
+--- ./skas-2.6.17-rc5-v9-pre9.patch.orig	2006-08-26 20:11:52.951176965 +0200
++++ ./skas-2.6.17-rc5-v9-pre9.patch	2006-08-26 20:13:09.407533965 +0200
+@@ -1407,12 +1407,6 @@
+ +#endif
+ +
+ +#endif
+-Index: linux-2.6.git/localversion-skas
+-===================================================================
+---- /dev/null
+-+++ linux-2.6.git/localversion-skas
+-@@ -0,0 +1 @@
+-+-skas3-v9-pre9
+ Index: linux-2.6.git/mm/Makefile
+ ===================================================================
+ --- linux-2.6.git.orig/mm/Makefile

Modified: trunk/src/kernel-patch-skas/debian/rules
===================================================================
--- trunk/src/kernel-patch-skas/debian/rules	2006-08-26 11:25:57 UTC (rev 160)
+++ trunk/src/kernel-patch-skas/debian/rules	2006-08-26 18:48:09 UTC (rev 161)
@@ -11,13 +11,23 @@
 
 	touch configure-stamp
 
-build: configure-stamp build-stamp
+patch: patch-stamp
+patch-stamp:
+	QUILT_PATCHES=debian/patches quilt push -a
+
+	touch patch-stamp
+
+build: configure-stamp patch-stamp build-stamp
 build-stamp:
 	dh_testdir
 
 	touch build-stamp
 
-clean:
+unpatch:
+	QUILT_PATCHES=debian/patches quilt pop -a
+	rm -f patch-stamp
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f configure-stamp build-stamp