[Pkg-xen-changes] r1076 - in branches/wheezy/xen/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: Fri Jul 27 10:29:06 2012
New Revision: 1076

Log:
* debian/bin/gencontrol.py: Use extra template for hypervisor meta packages.
* debian/rules.real
  - Remove special meta package routine.
  - Add dummy package rule.
* debian/templates/control.hypervisor.latest.in:
  Move meta package from debian/templates/control.hypervisor.in.

Added:
   branches/wheezy/xen/debian/templates/control.hypervisor.latest.in
Modified:
   branches/wheezy/xen/debian/bin/gencontrol.py
   branches/wheezy/xen/debian/rules.real
   branches/wheezy/xen/debian/templates/control.hypervisor.in

Modified: branches/wheezy/xen/debian/bin/gencontrol.py
==============================================================================
--- branches/wheezy/xen/debian/bin/gencontrol.py	Fri Jul 27 10:27:25 2012	(r1075)
+++ branches/wheezy/xen/debian/bin/gencontrol.py	Fri Jul 27 10:29:06 2012	(r1076)
@@ -76,14 +76,16 @@
 
     def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         hypervisor = self.templates["control.hypervisor"]
+        hypervisor_latest = self.templates["control.hypervisor.latest"]
 
         if not vars.has_key('desc'):
             vars['desc'] = ''
 
         packages_own = []
         packages_own.extend(self.process_packages(hypervisor, vars))
+        packages_dummy = self.process_packages(hypervisor_latest, vars)
 
-        for package in packages_own:
+        for package in packages_own + packages_dummy:
             name = package['Package']
             package.setdefault('Architecture', PackageArchitecture()).add(arch)
             if name in packages:
@@ -104,6 +106,9 @@
         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_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags]
+
+        cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (u' '.join([u"-p%s" % i['Package'] for i in packages_dummy]), makeflags)]
+
         makefile.add("binary-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_binary_arch)
         makefile.add("build-arch_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_build)
         makefile.add("setup_%s_%s_%s" % (arch, featureset, flavour), cmds = cmds_setup)

Modified: branches/wheezy/xen/debian/rules.real
==============================================================================
--- branches/wheezy/xen/debian/rules.real	Fri Jul 27 10:27:25 2012	(r1075)
+++ branches/wheezy/xen/debian/rules.real	Fri Jul 27 10:29:06 2012	(r1076)
@@ -23,7 +23,6 @@
 binary-arch-arch: install-lib-ocaml-dev_$(ARCH)
 binary-arch-arch: install-lib-ocaml_$(ARCH)
 binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
-binary-arch-flavour: install-hypervisor-flavour_$(FLAVOUR)
 
 binary-indep: install-docs
 binary-indep: install-utils-common
@@ -118,6 +117,12 @@
 	dh_md5sums
 	dh_builddeb
 
+install-dummy:
+	dh_testdir
+	dh_testroot
+	dh_prep
+	+$(MAKE_SELF) install-base
+
 install-docs: SOURCE_DIR = $(BUILD_DIR)/build-docs
 install-docs: DIR = $(BUILD_DIR)/install-docs
 install-docs: PACKAGE_NAME = xen-docs-$(VERSION)
@@ -141,14 +146,6 @@
 	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).gz
 	+$(MAKE_SELF) install-base
 
-install-hypervisor-flavour_$(FLAVOUR): PACKAGE_NAME = xen-hypervisor-$(FLAVOUR)
-install-hypervisor-flavour_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-hypervisor-flavour_$(FLAVOUR):
-	dh_testdir
-	dh_testroot
-	dh_prep
-	+$(MAKE_SELF) install-base
-
 install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
 install-libxen_$(ARCH): DH_OPTIONS = -plibxen-$(VERSION)
 install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)

Modified: branches/wheezy/xen/debian/templates/control.hypervisor.in
==============================================================================
--- branches/wheezy/xen/debian/templates/control.hypervisor.in	Fri Jul 27 10:27:25 2012	(r1075)
+++ branches/wheezy/xen/debian/templates/control.hypervisor.in	Fri Jul 27 10:29:06 2012	(r1076)
@@ -12,11 +12,3 @@
  In order to boot a XEN system along with this package you also need a kernel
  specifically crafted to work as the Domain 0, mediating hardware access for
  XEN itself.
-
-Package: xen-hypervisor at localversion@
-Depends: xen-hypervisor- at version@@localversion@, ${misc:Depends}
-Description: Latest Xen Hypervisor on @class@
- This package depends on the latest version of the Xen hypervisor for @class@
- .
- @desc@
-

Added: branches/wheezy/xen/debian/templates/control.hypervisor.latest.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/wheezy/xen/debian/templates/control.hypervisor.latest.in	Fri Jul 27 10:29:06 2012	(r1076)
@@ -0,0 +1,7 @@
+Package: xen-hypervisor at localversion@
+Depends: xen-hypervisor- at version@@localversion@, ${misc:Depends}
+Description: Latest Xen Hypervisor on @class@
+ This package depends on the latest version of the Xen hypervisor for @class@
+ .
+ @desc@
+