r3824 - people/waldi/kernel/source/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: 2005-08-10 13:55:41 +0000 (Wed, 10 Aug 2005)
New Revision: 3824

Modified:
   people/waldi/kernel/source/linux-2.6/debian/rules
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/rules.real: Move patch package rules from debian/rules.


Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 13:41:30 UTC (rev 3823)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 13:55:41 UTC (rev 3824)
@@ -25,51 +25,6 @@
 
 include debian/rules.defs
 
-#
-# linux-patch-debian
-#
-ppkg  := linux-patch-debian-$(version)
-pbase := /usr/src/kernel-patches/all/$(version)
-pfull := debian/$(ppkg)$(pbase)
-pdirs := $(pbase) $(pbase)/apply $(pbase)/debian $(pbase)/unpatch
-ptchs := $(notdir $(wildcard debian/patches-arch/*))
-kptch := debian/$(ppkg).kpatches.arch
-pcdir := debian/patches-arch
-patch-debian: debian/patch-debian-stamp
-debian/patch-debian-stamp: debian/bin/apply debian/bin/unpatch
-	dh_testdir
-	dh_testroot
-	dh_installdirs -p$(ppkg) $(pdirs)
-	dh_install -p$(ppkg) debian/patches-debian/* $(pbase)/debian
-#	Install the debian patches
-	sed 's/@version@/$(release)/g' debian/bin/apply > $(pfull)/apply/debian
-	sed 's/@upstream@/$(version)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
-	chmod a+x $(pfull)/apply/debian $(pfull)/unpatch/debian
-	chmod -x $(pfull)/debian/*.patch
-	bzip2 -9 $(pfull)/debian/*.patch
-#	Now the arch/subarch-specific patches
-	for i in $(ptchs); do					\
-	  rm -f $(kptch);					\
-	  arch=$${i%%.*};					\
-	  echo "Patch-name: $${arch}"       >> $(kptch);	\
-	  echo "Patch-id: $${arch}_$(uver)" >> $(kptch);	\
-	  echo "Path-strip-level: 1"        >> $(kptch);	\
-	  echo >> $(kptch);					\
-	  echo "Patch-file: $(pcdir)/$${i}" >> $(kptch);	\
-	  echo "Architecture: $${arch}"     >> $(kptch);	\
-	  echo "Kernel-version: $(version)" >> $(kptch);	\
-	  dh_installkpatches -p$(ppkg);				\
-	done
-	dh_fixperms -p$(ppkg)
-	dh_installdocs -p$(ppkg)
-	dh_installchangelogs -p$(ppkg)
-	dh_compress -p$(ppkg)
-	dh_installdeb -p$(ppkg)
-	dh_gencontrol -p$(ppkg)
-	dh_md5sums -p$(ppkg)
-	dh_builddeb -p$(ppkg)
-	touch debian/patch-debian-stamp
-
 setup: debian/setup-stamp
 debian/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 13:41:30 UTC (rev 3823)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 13:55:41 UTC (rev 3824)
@@ -81,7 +81,7 @@
 binary-arch-subarch: install-header-subarch-$(ARCH)-$(SUBARCH)
 binary-arch-flavour: install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
-binary-indep: install-doc install-source install-tree
+binary-indep: install-doc install-patch install-source install-tree
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
@@ -257,6 +257,7 @@
 install-dummy:
 	dh_testdir
 	dh_testroot
+	dh_clean -d -k
 	dh_installchangelogs
 	dh_installdocs
 	$(MAKE) -f debian/rules.real install-base
@@ -269,6 +270,46 @@
 	cd $(BUILD_DIR); tar -cjf linux-source-$(VERSION).tar.bz2 linux-source-$(VERSION)
 	rm -rf $(DIR)
 
+
+install-patch: ppkg  := linux-patch-debian-$(VERSION)
+install-patch: pbase := /usr/src/kernel-patches/all/$(VERSION)
+install-patch: pfull := debian/$(ppkg)$(pbase)
+install-patch: pdirs := $(pbase) $(pbase)/apply $(pbase)/debian $(pbase)/unpatch
+install-patch: ptchs := $(notdir $(wildcard debian/patches-arch/*))
+install-patch: kptch := debian/$(ppkg).kpatches.arch
+install-patch: pcdir := debian/patches-arch
+install-patch: DH_OPTIONS = -plinux-patch-debian-$(VERSION)
+install-patch:
+	dh_testdir
+	dh_testroot
+	dh_clean -d -k $(DH_OPTIONS)
+	dh_installdirs $(DH_OPTIONS) $(pdirs)
+	dh_install $(DH_OPTIONS) debian/patches-debian/* $(pbase)/debian
+#	Install the debian patches
+	sed 's/@version@/$(release)/g' debian/bin/apply > $(pfull)/apply/debian
+	sed 's/@upstream@/$(version)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
+	chmod a+x $(pfull)/apply/debian $(pfull)/unpatch/debian
+	chmod -x $(pfull)/debian/*.patch
+	bzip2 -9 $(pfull)/debian/*.patch
+#	Now the arch/subarch-specific patches
+	for i in $(ptchs); do \
+	  arch=$${i%%.*}; \
+	  ( \
+	    echo "Patch-name: $${arch}"; \
+	    echo "Patch-id: $${arch}_$(subst .,_,$(VERSION))"; \
+	    echo "Path-strip-level: 1"; \
+	    echo; \
+	    echo "Patch-file: $(pcdir)/$${i}"; \
+	    echo "Architecture: $${arch}"; \
+	    echo "Kernel-version: $(VERSION)"; \
+	    echo; \
+	  ) > $(kptch); \
+	  dh_installkpatches $(DH_OPTIONS); \
+	done
+	dh_installdocs $(DH_OPTIONS)
+	dh_installchangelogs $(DH_OPTIONS)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
+
 install-source: DH_OPTIONS = -plinux-source-$(VERSION)
 install-source: $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2
 	dh_testdir