Author: waldi
Date: Sun Nov 22 15:40:11 2009
New Revision: 701
Log:
* debian/bin/gencontrol.py: Export flavour specific xen arch.
* debian/rules.real: Remove old CONFIG variable for hypervisor building.
Modified:
trunk/xen-3/debian/bin/gencontrol.py
trunk/xen-3/debian/rules.real
Modified: trunk/xen-3/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-3/debian/bin/gencontrol.py Sun Nov 22 15:17:08 2009 (r700)
+++ trunk/xen-3/debian/bin/gencontrol.py Sun Nov 22 15:40:11 2009 (r701)
@@ -58,11 +58,13 @@
makefile.add(''setup_%s_real'' % arch, cmds =
cmds_setup)
def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour,
extra):
+ config_entry = self.config.merge(''base'', arch,
featureset, flavour)
+
for i in (
- (''config'', ''CONFIG''),
+ (''xen-arch'', ''XEN_ARCH''),
):
- if vars.has_key(i[0]):
- makeflags[i[1]] = vars[i[0]]
+ if config_entry.has_key(i[0]):
+ makeflags[i[1]] = config_entry[i[0]]
def do_flavour_packages(self, packages, makefile, arch, featureset,
flavour, vars, makeflags, extra):
hypervisor = self.templates["control.hypervisor"]
Modified: trunk/xen-3/debian/rules.real
=============================================================================---
trunk/xen-3/debian/rules.real Sun Nov 22 15:17:08 2009 (r700)
+++ trunk/xen-3/debian/rules.real Sun Nov 22 15:40:11 2009 (r701)
@@ -64,7 +64,6 @@
$(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR):
DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
$(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR):
$(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR)
+$(MAKE_CLEAN) -C $(DIR)/xen \
- $(CONFIG) \
XEN_COMPILE_ARCH=$(XEN_ARCH) \
XEN_TARGET_ARCH=$(XEN_ARCH)
touch $@