* debian/build: Move build infrastructure.

* debian/rules: Clean build dir
* debian/rules.real: Use build dir directly.

svn path=/dists/trunk/linux-tools/; revision=17872

debian/bin/genorig.py

@@ -98,7 +98,7 @@ class Main(object):
 
     def generate(self):
         self.log("Generate orig\n")
-        orig = os.path.join(self.dir, self.orig, 'kbuild')
+        orig = os.path.join(self.dir, self.orig)
         temp = os.path.join(self.dir, 'temp')
         os.makedirs(os.path.join(orig, 'include', 'linux'))
         for i in 'COPYING', 'Kbuild', 'Makefile':

debian/build/Makefile

@@ -9,4 +9,4 @@ OUTDIR = .
 
 top_srcdir = .
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc

debian/build/scripts/Makefile

@@ -47,4 +47,4 @@ top_srcdir = ..
 
 VPATH = $(top_srcdir)/kbuild/scripts
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc

debian/build/scripts/basic/Makefile

@@ -7,4 +7,4 @@ top_srcdir = ../..
 
 VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc

debian/build/scripts/genksyms/Makefile

@@ -6,7 +6,7 @@ top_srcdir = ../..
 
 VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 CFLAGS += -I$(VPATH)
 

debian/build/scripts/kconfig/Makefile

@@ -6,7 +6,7 @@ top_srcdir = ../..
 
 VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 CFLAGS += -I$(VPATH)
 

debian/build/scripts/mod/Makefile

@@ -9,7 +9,7 @@ OUTDIR = scripts/mod
 
 top_srcdir = ../..
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 modpost.real-%:
 	$(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod

debian/build/scripts/mod/Makefile.real

@@ -4,7 +4,7 @@ top_srcdir = ../..
 
 CFLAGS += -I$(top_srcdir)/kbuild/include
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 modpost.real-$(TYPE): file2alias.real-$(TYPE).o modpost.real-$(TYPE).o sumversion.real-$(TYPE).o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^

debian/rules

@@ -11,12 +11,12 @@ VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.*
 include debian/rules.defs
 
 build: debian/control $(STAMPS_DIR)/build-base
-$(STAMPS_DIR)/build-base: $(BUILD_DIR) $(STAMPS_DIR) kbuild/include/generated/autoconf.h
+$(STAMPS_DIR)/build-base: $(STAMPS_DIR) kbuild/include/generated/autoconf.h
 	dh_testdir
 	$(MAKE) -f debian/rules.gen build
 	touch $@
 
-$(BUILD_DIR) $(STAMPS_DIR):
+$(STAMPS_DIR):
 	@[ -d $@ ] || mkdir $@
 
 # modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined
@@ -46,7 +46,8 @@ maintainerclean:
 
 clean: debian/control
 	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
+	make -C $(BUILD_DIR) clean top_srcdir=$(CURDIR)
+	rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
 	dh_clean
 
 binary-indep:

debian/rules.real

@@ -6,25 +6,19 @@ binary-arch: install-kbuild
 
 build: $(STAMPS_DIR)/build
 
-$(STAMPS_DIR)/build: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/build: DIR=$(BUILD_DIR)/build
 $(STAMPS_DIR)/build:
-	rm -rf '$(DIR)'
-	mkdir -p '$(DIR)'
-	cp -al $(SOURCE_FILES) '$(DIR)'
-	$(MAKE) -C $(DIR) top_srcdir=$(CURDIR)
+	$(MAKE) -C $(BUILD_DIR) top_srcdir=$(CURDIR)
 	touch '$@'
 
 install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
 install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-kbuild: BASE_DIR = /usr/lib/$(PACKAGE_NAME)
-install-kbuild: SOURCE_DIR = $(BUILD_DIR)/build
 install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
 install-kbuild: $(STAMPS_DIR)/build
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
-	$(MAKE) -C $(SOURCE_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
+	$(MAKE) -C $(BUILD_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
 	dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
 	dh_installchangelogs
 	dh_installdocs