[kernel] r6047 - in dists/trunk/linux-2.6: . debian debian/modules

[Bastian Blank]

Author: waldi
Date: Fri Mar  3 16:32:38 2006
New Revision: 6047

Added:
   dists/trunk/linux-2.6/debian/modules/rules.defs
   dists/trunk/linux-2.6/debian/modules/rules.include
Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/rules.real
Log:
r6043:  waldi | 2006-03-03 17:17:43 +0100
debian/rules.real: Use correct scripts dir for headers packages.

r6045:  waldi | 2006-03-03 17:28:57 +0100
debian/modules/rules.defs, debian/modules/rules.include: Add.

r6046:  waldi | 2006-03-03 17:30:54 +0100
debian/modules/rules.include: Use another variable name.


Added: dists/trunk/linux-2.6/debian/modules/rules.defs
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/modules/rules.defs	Fri Mar  3 16:32:38 2006
@@ -0,0 +1,3 @@
+BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
+TEMPLATES_DIR = debian/templates

Added: dists/trunk/linux-2.6/debian/modules/rules.include
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/modules/rules.include	Fri Mar  3 16:32:38 2006
@@ -0,0 +1,54 @@
+__MODULES_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+
+DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+include $(__MODULES_DIR)rules.defs
+
+build: debian/control $(STAMPS_DIR)/build-stamp
+$(STAMPS_DIR)/build-stamp: $(BUILD_DIR) $(STAMPS_DIR)
+	dh_testdir
+	$(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
+	touch $@
+
+$(BUILD_DIR) $(STAMPS_DIR):
+	@[ -d $@ ] || mkdir $@
+
+clean: debian/control
+	dh_testdir
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
+	dh_clean
+
+binary-indep:
+	dh_testdir
+	$(MAKE) -f debian/rules.gen binary-indep
+
+binary-arch:
+	dh_testdir
+	$(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
+
+binary:	binary-indep binary-arch
+
+CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) 
+CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
+debian/control debian/rules.gen: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
+	if [ -f debian/control.md5sum ]; then \
+		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
+			$(MAKE) -f debian/rules debian/control-real; \
+		fi \
+	else \
+		$(MAKE) -f debian/rules debian/control-real; \
+	fi
+
+debian/control-real: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES)
+	$<
+	md5sum $^ > debian/control.md5sum
+	@echo
+	@echo This target is made to fail intentionally, to make sure
+	@echo that it is NEVER run during the automated build. Please
+	@echo ignore the following error, the debian/control file has
+	@echo been generated SUCCESSFULLY.
+	@echo
+	exit 1
+
+.PHONY: clean build binary-indep binary-arch binary

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Mar  3 16:32:38 2006
@@ -289,7 +289,9 @@
 	# *not* to copy, to make things a little bit more robust. We first create
 	# a file with exclude patterns, then copy everything minus excluded files.
 	#
-	tar $(foreach t, *.c *.h *.y *.l *.gperf *POTFILES.in .gitignore *lxdialog* *package* *.cc *.glade *_shipped, --exclude=$(t)) -chf - scripts | (cd "${DIR}"; umask 000; tar xsf -)
+	cd $(SOURCE_DIR); \
+	tar $(foreach t, *.c *.cc *.h *.l *.o *.y *.cmd *.glade *.gperf *POTFILES.in .gitignore *lxdialog* *package* *_shipped, --exclude=$(t)) -chf - scripts | \
+	(cd "${DIR}"; umask 000; tar -xvsf -)
 	
 	$(MAKE) -f debian/rules.real install-base