Never pass an empty PACKAGE_NAMES list to install-udeb_$(ARCH) rules
svn path=/dists/trunk/linux/; revision=19972
This commit is contained in:
parent
6082c199d8
commit
f0b5fe588b
|
@ -152,13 +152,15 @@ class Gencontrol(Base):
|
||||||
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. Also, this won't work
|
||||||
makefile.add(
|
# correctly with an empty package list.
|
||||||
'binary-arch_%s' % arch,
|
if udeb_packages:
|
||||||
cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
|
makefile.add(
|
||||||
"PACKAGE_NAMES='%s'" %
|
'binary-arch_%s' % arch,
|
||||||
(arch, makeflags,
|
cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
|
||||||
' '.join(p['Package'] for p in udeb_packages))])
|
"PACKAGE_NAMES='%s'" %
|
||||||
|
(arch, makeflags,
|
||||||
|
' '.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)
|
||||||
|
|
Loading…
Reference in New Issue