diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-03-11 00:41:47 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-03-11 00:43:41 +0000 |
| commit | 14ab885d53e75baf6b7228f89aaf293bbf90e6e1 (patch) | |
| tree | f1932a0b8b4c60bb78b1ef6a85799c7bc1935c15 /debian/bin | |
| parent | fb875ddeb6a72b9f20d6f43146f0ae0325c62600 (diff) | |
| download | kernel_replicant_linux-14ab885d53e75baf6b7228f89aaf293bbf90e6e1.tar.gz kernel_replicant_linux-14ab885d53e75baf6b7228f89aaf293bbf90e6e1.tar.bz2 kernel_replicant_linux-14ab885d53e75baf6b7228f89aaf293bbf90e6e1.zip | |
debian/bin/gencontrol.py: Remove unused code for extra package templates
Diffstat (limited to 'debian/bin')
| -rwxr-xr-x | debian/bin/gencontrol.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 96d0dba073be..ff3fe2be71b8 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -445,7 +445,6 @@ class Gencontrol(Base): desc.append_short(config_entry_description .get('part-short-' + part, '')) - packages_dummy = [] packages_own = [] build_signed = config_entry_build.get('signed-code') @@ -458,7 +457,6 @@ class Gencontrol(Base): image_main = self.process_real_image(image[0], image_fields, vars) packages_own.append(image_main) makeflags['IMAGE_PACKAGE_NAME'] = image_main['Package'] - packages_own.extend(self.process_packages(image[1:], vars)) package_headers = self.process_package(headers[0], vars) package_headers['Depends'].extend(relations_compiler_headers) @@ -488,7 +486,7 @@ class Gencontrol(Base): packages_own.extend(self.process_packages( self.templates['control.image-dbg'], vars)) - merge_packages(packages, packages_own + packages_dummy, arch) + merge_packages(packages, packages_own, arch) tests_control = self.process_package( self.templates['tests-control.image'][0], vars) @@ -564,11 +562,6 @@ class Gencontrol(Base): cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour " "%s" % makeflags] - if packages_dummy: - cmds_binary_arch.append( - "$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" - % (' '.join("-p%s" % i['Package'] for i in packages_dummy), - makeflags)) cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" % makeflags] cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch-flavour %s" % |