r2747 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian

[Sven Luther]

Author: luther
Date: 2005-03-20 07:59:23 +0100 (Sun, 20 Mar 2005)
New Revision: 2747

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Now building against kernel-tree-2.6.8-13.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control	2005-03-20 01:22:27 UTC (rev 2746)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control	2005-03-20 06:59:23 UTC (rev 2747)
@@ -1,7 +1,7 @@
 Source: kernel-patch-powerpc-2.6.8
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8, m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8-13, m4
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Sven Luther <luther@debian.org>
 Standards-Version: 3.6.1

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub	2005-03-20 01:22:27 UTC (rev 2746)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub	2005-03-20 06:59:23 UTC (rev 2747)
@@ -1,7 +1,7 @@
 Source: kernel-patch-powerpc-M4KERNEL
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-M4KERNEL, m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-M4TREE, m4
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Sven Luther <luther@debian.org>
 Standards-Version: 3.6.1

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2005-03-20 01:22:27 UTC (rev 2746)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2005-03-20 06:59:23 UTC (rev 2747)
@@ -10,6 +10,9 @@
 # Set to Yes if we are going to generate the metapackages.
 OFFICIAL_VERSION = No
 
+# This is the kernel-tree version we build against 
+ktver = 13
+
 # set the build architecture if necessary
 DEB_HOST_ARCH ?= $(shell dpkg --print-architecture)
 
@@ -22,7 +25,8 @@
 version	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
 
 # some files in debian/ get version numbers and stuff updated on the fly
-M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4FLAVOUR="$(flavour)"
+M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4FLAVOUR="$(flavour)" -DM4TREE="$(kernel)-$(ktver)"
+#M4 = sed -e 's%M4VERSION%$(version)%g' -e 's%M4KERNEL%$(kernel)%g' -e 's%M4FLAVOUR%$(flavour)%g' -e 's%M4TREE%$(kernel)-$(ktver)'
 debian/%: debian/%.m4
 	$(M4) $< > $@
 
@@ -81,7 +85,7 @@
 
 	test -d $(dir $(KSOURCE)) || mkdir -p $(dir $(KSOURCE))
 	tar jxCf $(dir $(KSOURCE)) /usr/src/kernel-source-$(kernel).tar.bz2
-	#cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian
+	cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian $(kernel)-$(ktver)
 	#for file in $(shell debian/list patches); do patch -d $(KSOURCE) -p1 < patches/$$file; done
 
 	-$(MAKE) -s -C config default > $(KSOURCE)/.config
@@ -354,7 +358,8 @@
 # change.
 
 # slightly different m4 call, using a shell variable for the flavour
-M4CONTROL = m4 -DM4KERNEL=$(kernel) -DM4FLAVOUR=$$flavour
+M4CONTROL = m4 -DM4KERNEL=$(kernel) -DM4FLAVOUR=$$flavour -DM4TREE=$(kernel)-$(ktver)
+#M4CONTROL = sed -e 's%M4KERNEL%$(kernel)%g' -e 's%M4FLAVOUR%$$flavour%g' -e 's%M4TREE%$(kernel)-$(ktver)%g'
 
 debian/control: \
 debian/changelog debian/flavours \