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" %
|
["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
|
||||||
(arch, makeflags)])
|
(arch, makeflags)])
|
||||||
|
|
||||||
# Add udebs using kernel-wedge
|
if self.changelog[0].distribution == 'UNRELEASED' and os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
|
||||||
installer_def_dir = 'debian/installer'
|
import warnings
|
||||||
installer_arch_dir = os.path.join(installer_def_dir, arch)
|
warnings.warn(u'Disable building of debug infos on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
|
||||||
if os.path.isdir(installer_arch_dir):
|
else:
|
||||||
kw_env = os.environ.copy()
|
# Add udebs using kernel-wedge
|
||||||
kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
|
installer_def_dir = 'debian/installer'
|
||||||
kw_env['KW_CONFIG_DIR'] = installer_arch_dir
|
installer_arch_dir = os.path.join(installer_def_dir, arch)
|
||||||
kw_proc = subprocess.Popen(
|
if os.path.isdir(installer_arch_dir):
|
||||||
['kernel-wedge', 'gen-control',
|
kw_env = os.environ.copy()
|
||||||
self.abiname],
|
kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
|
||||||
stdout=subprocess.PIPE,
|
kw_env['KW_CONFIG_DIR'] = installer_arch_dir
|
||||||
env=kw_env)
|
kw_proc = subprocess.Popen(
|
||||||
udeb_packages = read_control(kw_proc.stdout)
|
['kernel-wedge', 'gen-control',
|
||||||
kw_proc.wait()
|
self.abiname],
|
||||||
if kw_proc.returncode != 0:
|
stdout=subprocess.PIPE,
|
||||||
raise RuntimeError('kernel-wedge exited with code %d' %
|
env=kw_env)
|
||||||
kw_proc.returncode)
|
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/
|
# These packages must be built after the per-flavour/
|
||||||
# per-featureset packages.
|
# per-featureset packages.
|
||||||
makefile.add(
|
makefile.add(
|
||||||
'binary-arch_%s' % arch,
|
'binary-arch_%s' % arch,
|
||||||
cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
|
cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
|
||||||
"PACKAGE_NAMES='%s'" %
|
"PACKAGE_NAMES='%s'" %
|
||||||
(arch, makeflags,
|
(arch, makeflags,
|
||||||
' '.join(p['Package'] for p in udeb_packages))])
|
' '.join(p['Package'] for p in udeb_packages))])
|
||||||
|
|
||||||
def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
|
def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
|
||||||
config_base = self.config.merge('base', arch, featureset)
|
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'):
|
if build_debug and self.changelog[0].distribution == 'UNRELEASED' and os.getenv('DEBIAN_KERNEL_DISABLE_DEBUG'):
|
||||||
import warnings
|
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
|
build_debug = False
|
||||||
|
|
||||||
if build_debug:
|
if build_debug:
|
||||||
|
|
Loading…
Reference in New Issue