From 0b3d0d2e84a1609e53a26d98d04566c1d389d998 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 28 Oct 2011 21:32:19 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/modules: Remove. * debian/rules.real: Don't longer install external module stuff. svn path=/dists/trunk/linux-2.6/; revision=18198 --- debian/changelog | 1 + debian/modules/gencontrol.py | 62 ------------------------------- debian/modules/rules.defs | 3 -- debian/modules/rules.include | 61 ------------------------------ debian/modules/rules.real.include | 16 -------- debian/rules.real | 2 - 6 files changed, 1 insertion(+), 144 deletions(-) delete mode 100755 debian/modules/gencontrol.py delete mode 100644 debian/modules/rules.defs delete mode 100644 debian/modules/rules.include delete mode 100644 debian/modules/rules.real.include diff --git a/debian/changelog b/debian/changelog index 7518ef71b..f667f5c0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux-2.6 (3.1.0-1~experimental.1) UNRELEASED; urgency=low * Make gcc-4.6 the default compiler. * Use shorter versions in the package names. * Remove linux-tools-* binary package. + * Drop external module packages stuff. -- Ben Hutchings Tue, 27 Sep 2011 06:02:56 +0100 diff --git a/debian/modules/gencontrol.py b/debian/modules/gencontrol.py deleted file mode 100755 index 9dce85e05..000000000 --- a/debian/modules/gencontrol.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python - -import sys -sys.path.append(sys.path[0] + "/../lib/python") -import debian_linux.gencontrol -from debian_linux.config import * -from debian_linux.debian import * - -class gencontrol(debian_linux.gencontrol.gencontrol): - def __init__(self, config): - super(gencontrol, self).__init__(config) - self.process_config_version(config_parser({}, [sys.path[0] + "/../version"])) - - def do_main_packages(self, packages, extra): - vars = self.vars - - main = self.templates["control.main"] - packages.extend(self.process_packages(main, vars)) - - packages['source']['Build-Depends'].extend( - ['linux-support-%s%s' % (self.version['upstream'], self.abiname)] - ) - packages['source']['Build-Depends'].extend( - ['linux-headers-%s%s-all-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch) - for arch in self.config['base',]['arches']], - ) - - def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra): - config_entry = self.config.merge('base', arch, subarch, flavour) - if config_entry.get('modules', True) is False: - return - - super(gencontrol, self).do_flavour(packages, makefile, arch, subarch, flavour, vars, makeflags, extra) - - def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra): - modules = self.templates["control.modules"] - modules = self.process_packages(modules, vars) - - for package in modules: - name = package['Package'] - if packages.has_key(name): - package = packages.get(name) - package['Architecture'].append(arch) - else: - package['Architecture'] = [arch] - packages.append(package) - - cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags] - cmds_build = ["$(MAKE) -f debian/rules.real build %s" % makeflags] - cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags] - makefile.add('binary-arch_%s_%s_%s_real' % (arch, subarch, flavour), cmds = cmds_binary_arch) - makefile.add('build_%s_%s_%s_real' % (arch, subarch, flavour), cmds = cmds_build) - makefile.add('setup_%s_%s_%s_real' % (arch, subarch, flavour), cmds = cmds_setup) - - def process_config_version(self, config): - entry = config['version',] - self.version = parse_version(entry['source']) - self.abiname = entry['abiname'] - self.vars = self.process_version_linux(self.version, self.abiname) - -if __name__ == '__main__': - gencontrol(sys.path[0] + "/../arch")() diff --git a/debian/modules/rules.defs b/debian/modules/rules.defs deleted file mode 100644 index f070af0bd..000000000 --- a/debian/modules/rules.defs +++ /dev/null @@ -1,3 +0,0 @@ -BUILD_DIR = debian/build -STAMPS_DIR = debian/stamps -TEMPLATES_DIR = debian/templates diff --git a/debian/modules/rules.include b/debian/modules/rules.include deleted file mode 100644 index ac478397c..000000000 --- a/debian/modules/rules.include +++ /dev/null @@ -1,61 +0,0 @@ -__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 - -__BINNMU := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*\+b([0-9]+)$$,\1,p') - -BUILD_STAMP = $(STAMPS_DIR)/build-base - -build: debian/control $(BUILD_STAMP) -$(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 += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines) -GENCONTROL = $(__MODULES_DIR)gencontrol.py -debian/control debian/rules.gen: $(CONTROL_FILES) -ifeq ($(wildcard debian/control.md5sum),) - $(MAKE) -f debian/rules debian/control-real -else ifeq ($(__BINNMU),) - md5sum --check debian/control.md5sum --status || \ - $(MAKE) -f debian/rules debian/control-real -else - grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \ - $(MAKE) -f debian/rules debian/control-real -endif - -debian/control-real: $(CONTROL_FILES) - $(GENCONTROL) $(__MODULES_DIR).. - 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 diff --git a/debian/modules/rules.real.include b/debian/modules/rules.real.include deleted file mode 100644 index 04a44592c..000000000 --- a/debian/modules/rules.real.include +++ /dev/null @@ -1,16 +0,0 @@ -__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 - diff --git a/debian/rules.real b/debian/rules.real index 009e9e800..8d672bf81 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -320,8 +320,6 @@ install-support: dh_installdirs $(PACKAGE_ROOT)/lib/python/debian_linux $(PACKAGE_ROOT)/modules cp debian/config.defines.dump $(PACKAGE_DIR)$(PACKAGE_ROOT) cp debian/lib/python/debian_linux/*.py $(PACKAGE_DIR)$(PACKAGE_ROOT)/lib/python/debian_linux - cp debian/modules/* $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules - chmod a+x $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules/gencontrol.py dh_python2 dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME) +$(MAKE_SELF) install-base