[kernel] r5212 - people/waldi/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Tue Jan  3 16:54:18 2006
New Revision: 5212

Modified:
   people/waldi/linux-2.6/debian/rules
   people/waldi/linux-2.6/debian/rules.real
Log:
* debian/rules: Fix clean.
* debian/rules.real
  - Remove definition of old arch patches.
  - Use a variable for patch command.


Modified: people/waldi/linux-2.6/debian/rules
==============================================================================
--- people/waldi/linux-2.6/debian/rules	(original)
+++ people/waldi/linux-2.6/debian/rules	Tue Jan  3 16:54:18 2006
@@ -43,7 +43,7 @@
 
 clean: debian/control
 	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/*.pyc debian/*.kpatches.arch
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc
 	dh_clean
 
 binary-indep: build

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Tue Jan  3 16:54:18 2006
@@ -99,13 +99,17 @@
 	cd '$(BUILD_DIR)'; tar -cjf 'linux-source-$(UPSTREAM_VERSION).tar.bz2' 'linux-source-$(UPSTREAM_VERSION)'
 	rm -rf '$(DIR)'
 
+define patch_cmd
+cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
+endef
+
 srcfiles := $(filter-out debian, $(wildcard *))
 $(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/source: debian/bin/apply.py
 	rm -rf '$(DIR)'
 	mkdir -p '$(DIR)'
 	cp -al $(srcfiles) '$(DIR)'
-	cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
+	$(patch_cmd)
 	#make-kpkg does this when building kernel-source.
 	mv '$(DIR)/scripts/package/Makefile' '$(DIR)/scripts/package/Makefile.dist'
 	mv '$(DIR)/scripts/package/builddeb' '$(DIR)/scripts/package/builddeb.dist'
@@ -113,11 +117,6 @@
 	echo "all:" >> '$(DIR)/scripts/package/Makefile'
 	touch '$@'
 
-patches  := $(wildcard debian/patches-arch/$(SUBARCH).*)
-patches  += $(wildcard debian/patches-arch/$(SUBARCH)_*)
-patches  += $(wildcard debian/patches-arch/$(ARCH).*)
-patches  += $(wildcard debian/patches-arch/$(ARCH)_*)
-patches  := $(strip $(patches))
 $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
 $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source
@@ -128,7 +127,7 @@
 	cp debian/copyright '$(DIR)/debian'
 	cp debian/control '$(DIR)/debian/control'
 	touch '$(DIR)/debian/official'
-	cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' -a $(ARCH) -s $(SUBARCH) --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
+	$(patch_cmd) -a $(ARCH) -s $(SUBARCH)
 	touch '$@'
 #
 # This target performs a build for a particular flavour. Note