[kernel] r19972 - dists/trunk/linux/debian/bin
Ben Hutchings
benh at alioth.debian.org
Mon Apr 8 04:37:52 UTC 2013
Author: benh
Date: Mon Apr 8 04:37:51 2013
New Revision: 19972
Log:
Never pass an empty PACKAGE_NAMES list to install-udeb_$(ARCH) rules
Modified:
dists/trunk/linux/debian/bin/gencontrol.py
Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py Mon Apr 8 03:04:40 2013 (r19971)
+++ dists/trunk/linux/debian/bin/gencontrol.py Mon Apr 8 04:37:51 2013 (r19972)
@@ -152,13 +152,15 @@
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))])
+ # per-featureset packages. Also, this won't work
+ # correctly with an empty package list.
+ if udeb_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)
More information about the Kernel-svn-changes
mailing list