[kernel] r12008 - in dists/trunk/linux-modules-extra-2.6: debian loop-aes mol tp-smapi

[Bastian Blank]

Author: waldi
Date: Sat Aug  9 20:10:37 2008
New Revision: 12008

Log:
* debian/rules.real
  - Clean environment for module sub-make.
  - Mark all sub-make rules.
* loop-aes/rules, mol/rules, tp-smapi/rules: Mark all sub-make rules.


Modified:
   dists/trunk/linux-modules-extra-2.6/debian/rules.real
   dists/trunk/linux-modules-extra-2.6/loop-aes/rules
   dists/trunk/linux-modules-extra-2.6/mol/rules
   dists/trunk/linux-modules-extra-2.6/tp-smapi/rules

Modified: dists/trunk/linux-modules-extra-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/rules.real	Sat Aug  9 20:10:37 2008
@@ -12,6 +12,11 @@
   JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
 endif
 
+setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION -u MAKEFLAGS
+
+MAKE_CLEAN := $(setup_env) $(MAKE)
+MAKE_SELF := $(MAKE) -f debian/rules.real
+
 MODULEVERSION = $(shell dpkg -s $(MODULESOURCE) | perl -ne 'print $$2 if m/^Version: (\d+:)?(.*?)(-[^-]+)?$$/;')
 ifeq (,$(MODULEVERSION))
 $(error Was not able to retreive version of $(MODULESOURCE))
@@ -45,7 +50,7 @@
 
 $(BUILD_STAMP): $(SETUP_STAMP)
 $(BUILD_STAMP):
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG)
 	touch $@
 
 install-base: DH_OPTIONS = -p$(PACKAGE)
@@ -70,14 +75,14 @@
 
 install: $(BUILD_STAMP)
 install:
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
 
 install-real:
-	$(MAKE) -f debian/rules.real install
-	$(MAKE) -f debian/rules.real install-base \
+	+$(MAKE_SELF) install
+	+$(MAKE_SELF) install-base \
 		GENCONTROL_ARGS="-v$(VERSION_SOURCE)+$(MODULEVERSION)-$(VERSION_REVISION)" \
 		PACKAGE="$(PACKAGE_NAME)"
-	$(MAKE) -f debian/rules.real install-base \
+	+$(MAKE_SELF) install-base \
 		GENCONTROL_ARGS="-v2:$(VERSION_SOURCE)-$(VERSION_REVISION)" \
 		PACKAGE="$(PACKAGE_LATEST_NAME)"
 

Modified: dists/trunk/linux-modules-extra-2.6/loop-aes/rules
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/loop-aes/rules	(original)
+++ dists/trunk/linux-modules-extra-2.6/loop-aes/rules	Sat Aug  9 20:10:37 2008
@@ -11,7 +11,7 @@
 
 install: LIB_MODULES = $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)
 install:
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
 
 	# Rename module to loop-aes.ko
 	mv $(LIB_MODULES)/extra/loop-aes/loop.ko $(LIB_MODULES)/extra/loop-aes/loop-aes.ko

Modified: dists/trunk/linux-modules-extra-2.6/mol/rules
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/mol/rules	(original)
+++ dists/trunk/linux-modules-extra-2.6/mol/rules	Sat Aug  9 20:10:37 2008
@@ -1,10 +1,10 @@
 export BUILD_SHEEP=m
 
 $(BUILD_STAMP):
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/kmod $(JOBS_ARG)
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/netdriver $(JOBS_ARG)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/kmod $(JOBS_ARG)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/netdriver $(JOBS_ARG)
 	touch $@
 
 install:
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/kmod modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/netdriver modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/kmod modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/netdriver modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)

Modified: dists/trunk/linux-modules-extra-2.6/tp-smapi/rules
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/tp-smapi/rules	(original)
+++ dists/trunk/linux-modules-extra-2.6/tp-smapi/rules	Sat Aug  9 20:10:37 2008
@@ -1,6 +1,6 @@
 install: LIB_MODULES = $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)
 install:
-	$(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
+	+$(MAKE_CLEAN) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE)
 
 	# Add hdaps.ko symlink to updates/
 	mkdir -p $(LIB_MODULES)/updates