debian/bin/gencontrol.py: Make it possible to disable udeb generation.
svn path=/dists/sid/linux/; revision=19147
This commit is contained in:
parent
1b8de128ea
commit
d1bd5f4a19
|
@ -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)
|
||||
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)
|
||||
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))])
|
||||
# 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:
|
||||
|
|
Loading…
Reference in New Issue