Author: daniel
Date: Thu Jan 31 07:54:04 2008
New Revision: 10319
Log:
Importing rules changes from l-m-e-2.6.
Modified:
dists/trunk/linux-modules-contrib-2.6/debian/rules
dists/trunk/linux-modules-contrib-2.6/debian/rules.real
Modified: dists/trunk/linux-modules-contrib-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/rules (original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/rules Thu Jan 31 07:54:04 2008
@@ -7,7 +7,7 @@
setup: debian/control $(STAMPS_DIR)/setup-base
$(STAMPS_DIR)/setup-base: $(BUILD_DIR) $(STAMPS_DIR)
dh_testdir
- $(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
+ $(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
touch $@
$(BUILD_STAMP): $(STAMPS_DIR)/setup-base
Modified: dists/trunk/linux-modules-contrib-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/rules.real (original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/rules.real Thu Jan 31
07:54:04 2008
@@ -4,8 +4,8 @@
include
/usr/src/linux-support-$(UPSTREAMVERSION)$(ABINAME)/modules/rules.real.include
-BUILD_STAMP = $(STAMPS_DIR)/build_$(ARCH)_$(SUBARCH)_$(FLAVOUR)_$(MODULE)
-SETUP_STAMP = $(STAMPS_DIR)/setup_$(ARCH)_$(SUBARCH)_$(FLAVOUR)_$(MODULE)
+BUILD_STAMP = $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(MODULE)
+SETUP_STAMP = $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(MODULE)
SOURCE_STAMP = $(STAMPS_DIR)/source_$(MODULE)
ifdef DEBIAN_KERNEL_JOBS
@@ -24,7 +24,7 @@
build: $(BUILD_STAMP)
setup: $(SETUP_STAMP)
-$(SETUP_STAMP) $(BUILD_STAMP) install:
DIR=$(BUILD_DIR)/build_$(ARCH)_$(SUBARCH)_$(FLAVOUR)_$(MODULE)
+$(SETUP_STAMP) $(BUILD_STAMP) install:
DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(MODULE)
$(SOURCE_STAMP) $(SETUP_STAMP): SOURCE_DIR=$(BUILD_DIR)/source_$(MODULE)
$(SOURCE_STAMP): TAR = /usr/src/$(MODULE).tar.bz2
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
