Use --overlay-dir to patch make-kpkg files. Drop kpkg-2.6.33.patch.

27 files changed, 3 insertions, 377 deletions

diff --git a/lemote/gnewsense/branches/2.6.33/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.33/kpkg-2.6.33.patch
deleted file mode 100644
index 796c6b56e..000000000
--- a/lemote/gnewsense/branches/2.6.33/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2010-04-04 22:44:45.000000000 -0300
-+++ debian/ruleset/misc/version_vars.mk	2010-04-04 22:46:00.000000000 -0300
-@@ -138,7 +138,9 @@ iatv :=
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2010-04-04 22:42:45.000000000 -0300
-+++ debian/ruleset/targets/common.mk	2010-04-04 22:43:56.000000000 -0300
-@@ -333,7 +333,7 @@ endif
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.33/series b/lemote/gnewsense/branches/2.6.33/series
index cca849e04..596bfe77c 100644
--- a/lemote/gnewsense/branches/2.6.33/series
+++ b/lemote/gnewsense/branches/2.6.33/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/2.6.34/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.34/kpkg-2.6.33.patch
deleted file mode 100644
index 796c6b56e..000000000
--- a/lemote/gnewsense/branches/2.6.34/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2010-04-04 22:44:45.000000000 -0300
-+++ debian/ruleset/misc/version_vars.mk	2010-04-04 22:46:00.000000000 -0300
-@@ -138,7 +138,9 @@ iatv :=
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2010-04-04 22:42:45.000000000 -0300
-+++ debian/ruleset/targets/common.mk	2010-04-04 22:43:56.000000000 -0300
-@@ -333,7 +333,7 @@ endif
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.34/series b/lemote/gnewsense/branches/2.6.34/series
index 5775fbdd8..26a36256d 100644
--- a/lemote/gnewsense/branches/2.6.34/series
+++ b/lemote/gnewsense/branches/2.6.34/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/2.6.35/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.35/kpkg-2.6.33.patch
deleted file mode 100644
index 796c6b56e..000000000
--- a/lemote/gnewsense/branches/2.6.35/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2010-04-04 22:44:45.000000000 -0300
-+++ debian/ruleset/misc/version_vars.mk	2010-04-04 22:46:00.000000000 -0300
-@@ -138,7 +138,9 @@ iatv :=
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2010-04-04 22:42:45.000000000 -0300
-+++ debian/ruleset/targets/common.mk	2010-04-04 22:43:56.000000000 -0300
-@@ -333,7 +333,7 @@ endif
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.35/series b/lemote/gnewsense/branches/2.6.35/series
index 1954790db..adfa2d6f1 100644
--- a/lemote/gnewsense/branches/2.6.35/series
+++ b/lemote/gnewsense/branches/2.6.35/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/2.6.36/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.36/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/2.6.36/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.36/series b/lemote/gnewsense/branches/2.6.36/series
index 8449a01f0..025644480 100644
--- a/lemote/gnewsense/branches/2.6.36/series
+++ b/lemote/gnewsense/branches/2.6.36/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/2.6.37/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.37/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/2.6.37/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.37/series b/lemote/gnewsense/branches/2.6.37/series
index 01c5cf430..65f61ef26 100644
--- a/lemote/gnewsense/branches/2.6.37/series
+++ b/lemote/gnewsense/branches/2.6.37/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/2.6.38/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.38/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/2.6.38/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.38/series b/lemote/gnewsense/branches/2.6.38/series
index bd95a40f5..027e42f61 100644
--- a/lemote/gnewsense/branches/2.6.38/series
+++ b/lemote/gnewsense/branches/2.6.38/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/2.6.39/kpkg-2.6.33.patch b/lemote/gnewsense/branches/2.6.39/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/2.6.39/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/2.6.39/series b/lemote/gnewsense/branches/2.6.39/series
index 1872264c9..ef8f2bfd1 100644
--- a/lemote/gnewsense/branches/2.6.39/series
+++ b/lemote/gnewsense/branches/2.6.39/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/3.1/kpkg-2.6.33.patch b/lemote/gnewsense/branches/3.1/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/3.1/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/3.1/series b/lemote/gnewsense/branches/3.1/series
index b7f9ca4a8..f57485c83 100644
--- a/lemote/gnewsense/branches/3.1/series
+++ b/lemote/gnewsense/branches/3.1/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/3.2/kpkg-2.6.33.patch b/lemote/gnewsense/branches/3.2/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/3.2/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/3.2/series b/lemote/gnewsense/branches/3.2/series
index 962e16acd..4990fea57 100644
--- a/lemote/gnewsense/branches/3.2/series
+++ b/lemote/gnewsense/branches/3.2/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/3.3/kpkg-2.6.33.patch b/lemote/gnewsense/branches/3.3/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/3.3/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/3.3/series b/lemote/gnewsense/branches/3.3/series
index 1f22d4c62..11cae2cc6 100644
--- a/lemote/gnewsense/branches/3.3/series
+++ b/lemote/gnewsense/branches/3.3/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/3.5/kpkg-2.6.33.patch b/lemote/gnewsense/branches/3.5/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/3.5/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/3.5/series b/lemote/gnewsense/branches/3.5/series
index c1bbf2b0f..c3b04e0bf 100644
--- a/lemote/gnewsense/branches/3.5/series
+++ b/lemote/gnewsense/branches/3.5/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/3.6/kpkg-2.6.33.patch b/lemote/gnewsense/branches/3.6/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/3.6/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/3.6/series b/lemote/gnewsense/branches/3.6/series
index d13e75b88..47e9db1a6 100644
--- a/lemote/gnewsense/branches/3.6/series
+++ b/lemote/gnewsense/branches/3.6/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/3.7/kpkg-2.6.33.patch b/lemote/gnewsense/branches/3.7/kpkg-2.6.33.patch
deleted file mode 100644
index 9feef5e0d..000000000
--- a/lemote/gnewsense/branches/3.7/kpkg-2.6.33.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: debian/ruleset/misc/version_vars.mk
-===================================================================
---- debian/ruleset/misc/version_vars.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/misc/version_vars.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -138,7 +138,9 @@
- EXTRAV_ARG :=
- endif
- 
--UTS_RELEASE_HEADER=$(call doit,if [ -f include/linux/utsrelease.h ]; then  \
-+UTS_RELEASE_HEADER=$(call doit,if [ -f include/generated/utsrelease.h ]; then  \
-+	                       echo include/generated/utsrelease.h;            \
-+	                   elif [ -f include/linux/utsrelease.h ]; then  \
- 	                       echo include/linux/utsrelease.h;            \
- 	                   else                                            \
-                                echo include/linux/version.h ;              \
-Index: debian/ruleset/targets/common.mk
-===================================================================
---- debian/ruleset/targets/common.mk.orig	2008-11-24 17:01:32.000000000 +0000
-+++ debian/ruleset/targets/common.mk	2010-12-12 13:57:33.000000000 +0000
-@@ -333,7 +333,7 @@
- 	@echo this was built on a machine with the kernel: >> debian/buildinfo
- 	uname -a >> debian/buildinfo
- 	echo using the compiler: >> debian/buildinfo
--	grep LINUX_COMPILER include/linux/compile.h | \
-+	grep LINUX_COMPILER include/generated/compile.h | \
- 	   sed -e 's/.*LINUX_COMPILER "//' -e 's/"$$//' >> debian/buildinfo
- ifneq ($(strip $(shell test -f version.Debian && cat version.Debian)),)
- 	echo kernel source package used: >> debian/buildinfo
diff --git a/lemote/gnewsense/branches/3.7/series b/lemote/gnewsense/branches/3.7/series
index fcbcea221..0dfba7f53 100644
--- a/lemote/gnewsense/branches/3.7/series
+++ b/lemote/gnewsense/branches/3.7/series
@@ -3,4 +3,3 @@ gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file
 kpkg-mipsel.patch -p0 # use vmlinuz
-kpkg-2.6.33.patch -p0 # adjust for 2.6.33
diff --git a/lemote/gnewsense/branches/build b/lemote/gnewsense/branches/build
index 265070d86..905175ab4 100755
--- a/lemote/gnewsense/branches/build
+++ b/lemote/gnewsense/branches/build
@@ -103,8 +103,11 @@ if $prep; then
   false
 fi
 
+mv debian `pwd`.debian
 make-kpkg --rootcmd fakeroot --initrd --revision $rev \
+ --overlay-dir `pwd`.debian \
   kernel-image kernel-headers kernel-doc kernel-source
+rm -rf `pwd`.debian
 cd ..
 
 tar -cf $buildtb -C $srctree --use=bzip2 --exclude=debian/linux-*$buildnorev .