[kernel] r6383 - in people/waldi/linux-2.6-exp/debian: . bin

[Bastian Blank]

Author: waldi
Date: Sun Apr  9 21:06:10 2006
New Revision: 6383

Removed:
   people/waldi/linux-2.6-exp/debian/bin/apply.py
Modified:
   people/waldi/linux-2.6-exp/debian/rules
   people/waldi/linux-2.6-exp/debian/rules.real
Log:
* debian/bin/apply.py
* debian/rules: Remove links in debian/arch and debian/patches on clean.
* debian/rules.real:
  - Pull in configs from the support dir.
  - Always use patch script from support dir.


Modified: people/waldi/linux-2.6-exp/debian/rules
==============================================================================
--- people/waldi/linux-2.6-exp/debian/rules	(original)
+++ people/waldi/linux-2.6-exp/debian/rules	Sun Apr  9 21:06:10 2006
@@ -45,6 +45,7 @@
 clean: debian/control
 	dh_testdir
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
+	find debian/arch debian/patches -type l | xargs -r rm
 	dh_clean
 
 binary-indep:

Modified: people/waldi/linux-2.6-exp/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6-exp/debian/rules.real	(original)
+++ people/waldi/linux-2.6-exp/debian/rules.real	Sun Apr  9 21:06:10 2006
@@ -91,6 +91,9 @@
 	@echo "Generating configuration file $@:"
 	ocaml debian/bin/kconfig.ml -b "debian/arch" -a "$(ARCH)" -s "$(SUBARCH)" -f "$(FLAVOUR)" > '$@'
 
+debian/arch/$(ARCH)/config: $(SUPPORT_DIR)/arch/$(ARCH)/config
+	ln -s $< $@
+
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
@@ -101,16 +104,17 @@
 	rm -rf '$(DIR)'
 
 define patch_cmd
-cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCEVERSION)' --overwrite-revisions='$(REVISIONS)'
+cd '$(DIR)'; /usr/src/kernel-patches/all/$(UPSTREAMVERSION)/apply/debian --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCEVERSION)' --overwrite-revisions='$(REVISIONS)'
 endef
 
 srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/source: debian/bin/apply.py
+$(STAMPS_DIR)/source:
 	rm -rf '$(DIR)'
 	mkdir -p '$(DIR)'
 	tar -xjf /usr/src/linux-source-$(UPSTREAMVERSION).tar.bz2
 	cd linux-source-$(UPSTREAMVERSION); /usr/src/kernel-patches/all/$(UPSTREAMVERSION)/apply/debian $(UPSTREAMVERSION)$(PARENT_REVISION)
+	rm linux-source-$(UPSTREAMVERSION)/version.Debian
 	mv linux-source-$(UPSTREAMVERSION)/* '$(DIR)'
 	rm -rf linux-source-$(UPSTREAMVERSION)
 	touch '$@'