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

[Bastian Blank]

Author: waldi
Date: 2005-08-10 12:06:13 +0000 (Wed, 10 Aug 2005)
New Revision: 3816

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 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 11:53:38 UTC (rev 3815)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 12:06:13 UTC (rev 3816)
@@ -25,28 +25,6 @@
 
 include debian/rules.defs
 
-patch: debian/patch-stamp
-debian/patch-stamp: debian/bin/apply
-	dh_testdir
-	chmod +x debian/bin/apply
-	override_version=$(release) home=debian/patches-debian debian/bin/apply
-#	make-kpkg does this when building kernel-source.
-	mv scripts/package/Makefile scripts/package/Makefile.dist
-	mv scripts/package/builddeb scripts/package/builddeb.dist
-	echo "# Dummy Makefile" > scripts/package/Makefile
-	echo "all:" >> scripts/package/Makefile
-	touch debian/patch-stamp
-
-unpatch:
-	dh_testdir
-	if [ -e debian/patch-stamp ]; then				\
-	  override_version=$(release) home=debian/patches-debian	\
-	    debian/bin/apply $(version);				\
-	  cd scripts/package;						\
-	  mv Makefile.dist Makefile;					\
-	  mv builddeb.dist builddeb;					\
-	fi
-	rm -f debian/patch-stamp
 #
 # linux-source package
 #
@@ -156,7 +134,7 @@
 	touch debian/doc-stamp
 
 setup: debian/setup-stamp
-debian/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR) debian/patch-stamp
+debian/setup-stamp: $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir
 	$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
 	touch $@

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 11:53:38 UTC (rev 3815)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:06:13 UTC (rev 3816)
@@ -147,16 +147,30 @@
 #	Flavour config file must be present
 	cat $(basedir)/config.$(FLAVOUR) >> $@			 
 
-srcfiles := $(filter-out debian linux-source-$(VERSION), $(wildcard *))
+srcfiles := $(filter-out debian, $(wildcard *))
+$(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source: debian/bin/apply
+	rm -rf $(DIR)
+	mkdir -p $(DIR)
+	cp -al $(srcfiles) $(DIR)
+	cd $(DIR); override_version=$(VERSION)$(DEBNUM) home=$(CURDIR)/debian/patches-debian $(CURDIR)/debian/bin/apply
+	#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
+	echo "# Dummy Makefile" > $(DIR)/scripts/package/Makefile
+	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): $(BUILD_DIR)/post-install-$(ARCH)-$(SUBARCH)
-	mkdir -p $(DIR)
-	cp -al $(srcfiles) $(DIR)
+$(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source $(BUILD_DIR)/post-install-$(ARCH)-$(SUBARCH)
+	rm -rf $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
 	mkdir -p $(DIR)/debian
 	cp debian/changelog $(DIR)/debian
 	cp debian/copyright $(DIR)/debian