Author: waldi Date: Sun Jul 1 15:52:19 2012 New Revision: 1057 Log: debian/bin/gencontrol.py, debian/rules.real: Finish build-indep support. Modified: trunk/xen/debian/bin/gencontrol.py trunk/xen/debian/rules.real Modified: trunk/xen/debian/bin/gencontrol.py =============================================================================--- trunk/xen/debian/bin/gencontrol.py Sun Jul 1 15:35:01 2012 (r1056) +++ trunk/xen/debian/bin/gencontrol.py Sun Jul 1 15:52:19 2012 (r1057) @@ -55,7 +55,7 @@ file("debian/%s.%s" % (package_utils_name, i), ''w'').write(j) cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags] - cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" % makeflags] + cmds_build = ["$(MAKE) -f debian/rules.real build-arch-arch %s" % makeflags] cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch %s" % makeflags] makefile.add(''binary-arch_%s_real'' % arch, cmds = cmds_binary_arch) makefile.add(''build-arch_%s_real'' % arch, cmds = cmds_build) @@ -102,7 +102,7 @@ file("debian/%s.%s" % (package_name, i), ''w'').write(j) cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags] - cmds_build = ["$(MAKE) -f debian/rules.real build-flavour %s" % makeflags] + cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" % makeflags] cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags] makefile.add("binary-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_binary_arch) makefile.add("build_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_build) Modified: trunk/xen/debian/rules.real =============================================================================--- trunk/xen/debian/rules.real Sun Jul 1 15:35:01 2012 (r1056) +++ trunk/xen/debian/rules.real Sun Jul 1 15:52:19 2012 (r1057) @@ -27,8 +27,10 @@ binary-indep: install-docs binary-indep: install-utils-common -build-arch: $(STAMPS_DIR)/build-utils_$(ARCH) -build-flavour: $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) +build-arch-arch: $(STAMPS_DIR)/build-utils_$(ARCH) +build-arch-flavour: $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR) + +build-indep: $(STAMPS_DIR)/build-docs setup-arch: $(STAMPS_DIR)/setup-utils_$(ARCH) setup-flavour: $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR)