diff options
author | Bastian Blank <waldi@debian.org> | 2012-06-14 08:30:37 +0000 |
---|---|---|
committer | Bastian Blank <waldi@debian.org> | 2012-06-14 08:30:37 +0000 |
commit | d1bd5f4a195746478932a552b478d2ce39d5aa82 (patch) | |
tree | ba3c088a26f3717823a8497380144db96379df75 | |
parent | 1b8de128ea81ea5df4f0ac3d22bf83b880ad381f (diff) | |
download | kernel_replicant_linux-d1bd5f4a195746478932a552b478d2ce39d5aa82.tar.gz kernel_replicant_linux-d1bd5f4a195746478932a552b478d2ce39d5aa82.tar.bz2 kernel_replicant_linux-d1bd5f4a195746478932a552b478d2ce39d5aa82.zip |
debian/bin/gencontrol.py: Make it possible to disable udeb generation.
svn path=/dists/sid/linux/; revision=19147
-rwxr-xr-x | debian/bin/gencontrol.py | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index c0876a3041ac..24d61f014e93 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -114,34 +114,38 @@ class Gencontrol(Base): ["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" % (arch, makeflags)]) - # Add udebs using kernel-wedge - installer_def_dir = 'debian/installer' - installer_arch_dir = os.path.join(installer_def_dir, arch) - if os.path.isdir(installer_arch_dir): - kw_env = os.environ.copy() - kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir - kw_env['KW_CONFIG_DIR'] = installer_arch_dir - kw_proc = subprocess.Popen( - ['kernel-wedge', 'gen-control', - self.abiname], - stdout=subprocess.PIPE, - env=kw_env) - udeb_packages = read_control(kw_proc.stdout) - kw_proc.wait() - if kw_proc.returncode != 0: - raise RuntimeError('kernel-wedge exited with code %d' % - kw_proc.returncode) - - self.merge_packages(packages, udeb_packages, arch) - - # These packages must be built after the per-flavour/ - # per-featureset packages. - makefile.add( - 'binary-arch_%s' % arch, - cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s " - "PACKAGE_NAMES='%s'" % - (arch, makeflags, - ' '.join(p['Package'] for p in udeb_packages))]) + if self.changelog[0].distribution == 'UNRELEASED' and os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'): + import warnings + warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)') + else: + # Add udebs using kernel-wedge + installer_def_dir = 'debian/installer' + installer_arch_dir = os.path.join(installer_def_dir, arch) + if os.path.isdir(installer_arch_dir): + kw_env = os.environ.copy() + kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir + kw_env['KW_CONFIG_DIR'] = installer_arch_dir + kw_proc = subprocess.Popen( + ['kernel-wedge', 'gen-control', + self.abiname], + stdout=subprocess.PIPE, + env=kw_env) + udeb_packages = read_control(kw_proc.stdout) + kw_proc.wait() + if kw_proc.returncode != 0: + raise RuntimeError('kernel-wedge exited with code %d' % + kw_proc.returncode) + + self.merge_packages(packages, udeb_packages, arch) + + # These packages must be built after the per-flavour/ + # per-featureset packages. + makefile.add( + 'binary-arch_%s' % arch, + cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s " + "PACKAGE_NAMES='%s'" % + (arch, makeflags, + ' '.join(p['Package'] for p in udeb_packages))]) def do_featureset_setup(self, vars, makeflags, arch, featureset, extra): config_base = self.config.merge('base', arch, featureset) @@ -282,7 +286,7 @@ class Gencontrol(Base): if build_debug and self.changelog[0].distribution == 'UNRELEASED' and os.getenv('DEBIAN_KERNEL_DISABLE_DEBUG'): import warnings - warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_DEBUG)') + warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_DEBUG set)') build_debug = False if build_debug: |