[kernel] r6351 - dists/sid/linux-2.6/debian/modules

[Bastian Blank]

Author: waldi
Date: Thu Mar 30 21:05:24 2006
New Revision: 6351

Added:
   dists/sid/linux-2.6/debian/modules/rules.real.include
Modified:
   dists/sid/linux-2.6/debian/modules/rules.include
Log:
* debian/modules/rules.include: Don't expect debian/arch/defines to be available.
* debian/modules/rules.real.include: Add.


Modified: dists/sid/linux-2.6/debian/modules/rules.include
==============================================================================
--- dists/sid/linux-2.6/debian/modules/rules.include	(original)
+++ dists/sid/linux-2.6/debian/modules/rules.include	Thu Mar 30 21:05:24 2006
@@ -30,7 +30,7 @@
 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)
+CONTROL_FILES += $(wildcard 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 \

Added: dists/sid/linux-2.6/debian/modules/rules.real.include
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/modules/rules.real.include	Thu Mar 30 21:05:24 2006
@@ -0,0 +1,16 @@
+__MODULES_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+
+DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
+
+export DH_OPTIONS
+
+HEADERS_DIR = /usr/src/linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+
+include $(__MODULES_DIR)rules.defs
+
+ifdef DEBIAN_KERNEL_JOBS
+  JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
+endif
+