From c4da84d9df44364da7baa3c8a1d437307941f2e7 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 8 Aug 2005 13:51:37 +0000 Subject: [PATCH] Build as much packages as possible at one time. * debian/Makefile: Update. * debian/bin/gencontrol.py: Produce only one call per flavour. svn path=/trunk/kernel/source/linux-2.6/; revision=3740 --- debian/Makefile | 16 ++++++++-------- debian/bin/gencontrol.py | 5 +---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index 400229704..cac944af7 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -245,13 +245,13 @@ build-$(subarch)-%: $(kdir) config.% binary-dummy: dh_testdir dh_testroot - dh_installchangelogs -p$(PACKAGE) - dh_installdocs -p$(PACKAGE) - dh_compress -p$(PACKAGE) - dh_fixperms -p$(PACKAGE) - dh_installdeb -p$(PACKAGE) - dh_gencontrol -p$(PACKAGE) - dh_md5sums -p$(PACKAGE) - dh_builddeb -p$(PACKAGE) + dh_installchangelogs $(PACKAGES_ARG) + dh_installdocs $(PACKAGES_ARG) + dh_compress $(PACKAGES_ARG) + dh_fixperms $(PACKAGES_ARG) + dh_installdeb $(PACKAGES_ARG) + dh_gencontrol $(PACKAGES_ARG) + dh_md5sums $(PACKAGES_ARG) + dh_builddeb $(PACKAGES_ARG) .PHONY: build unpack binary-indep binary-arch binary diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index f4798576e..87b353648 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -370,10 +370,7 @@ if __name__ == '__main__': for i in ('binary', 'build', 'unpack'): makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None)) - rule = [] - for i in dummy_packages: - rule.append("$(MAKE) -f debian/Makefile binary-dummy PACKAGE=%s" % i['Package']) - makefile.append(("binary-%s-%s-%s:" % (arch, subarch_text, flavour), rule)) + makefile.append(("binary-%s-%s-%s:" % (arch, subarch_text, flavour), ("$(MAKE) -f debian/Makefile binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))) write_control(packages) write_makefile(makefile)