diff options
| author | Bastian Blank <waldi@debian.org> | 2006-03-31 17:13:35 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2006-03-31 17:13:35 +0000 |
| commit | a27da8be623f74a6d6862877b0af8f2424197efd (patch) | |
| tree | 187c90914de6a267eafcf172fb1f81618843c58d /debian/modules | |
| parent | b55427f44acdaf060697477c82083c1c83b2c406 (diff) | |
Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6356
Diffstat (limited to 'debian/modules')
| -rwxr-xr-x | debian/modules/gencontrol.py | 1 | ||||
| -rw-r--r-- | debian/modules/rules.include | 8 | ||||
| -rw-r--r-- | debian/modules/rules.real.include | 16 |
3 files changed, 20 insertions, 5 deletions
diff --git a/debian/modules/gencontrol.py b/debian/modules/gencontrol.py index c9f7abfe3..8cc05d71e 100755 --- a/debian/modules/gencontrol.py +++ b/debian/modules/gencontrol.py @@ -11,7 +11,6 @@ class gencontrol(debian_linux.gencontrol.gencontrol): main = self.templates["control.main"] packages.extend(self.process_packages(main, vars)) - def do_main_packages(self, packages): l = ['linux-headers-%s%s-all-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch) for arch in self.config['base',]['arches']] packages['source']['Build-Depends'].extend(l) diff --git a/debian/modules/rules.include b/debian/modules/rules.include index 7d5ca8961..0720da490 100644 --- a/debian/modules/rules.include +++ b/debian/modules/rules.include @@ -30,8 +30,8 @@ binary-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) +CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines) +debian/control debian/rules.gen: $(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; \ @@ -40,8 +40,8 @@ debian/control debian/rules.gen: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES) $(MAKE) -f debian/rules debian/control-real; \ fi -debian/control-real: $(__MODULES_DIR)gencontrol.py $(CONTROL_FILES) - $< +debian/control-real: $(CONTROL_FILES) + $(__MODULES_DIR)gencontrol.py md5sum $^ > debian/control.md5sum @echo @echo This target is made to fail intentionally, to make sure diff --git a/debian/modules/rules.real.include b/debian/modules/rules.real.include new file mode 100644 index 000000000..04a44592c --- /dev/null +++ b/debian/modules/rules.real.include @@ -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 + |