[kernel] r7415 - in dists/sid/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Thu Sep 14 10:44:48 2006
New Revision: 7415

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/rules.real

Log:
* debian/bin/gencontrol.py: Export xen hypervisor versions.
* debian/rules.real: Add xen version informations to images.


Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Thu Sep 14 10:44:48 2006
@@ -135,6 +135,7 @@
             l = package_relation_group()
             for version in config_entry_xen['versions']:
                 l.append("xen-hypervisor-%s-%s" % (version, config_entry_xen['flavour']))
+            makeflags['XEN_VERSIONS'] = ' '.join(config_entry_xen['versions'])
             p[0]['Depends'].append(l)
             packages_dummy.extend(p)
         else:

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	(original)
+++ dists/sid/linux-2.6/debian/rules.real	Thu Sep 14 10:44:48 2006
@@ -374,7 +374,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -d -k
-	DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot'
+	DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot' 'var/lib/$(PACKAGE_NAME)'
 	DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
 	cp $(DIR)/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 	cd $(DIR); $(setup_env) make modules_install ARCH=$(KERNEL_ARCH) INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
@@ -382,6 +382,9 @@
 	cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
 	rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}
 	DH_OPTIONS= dh_installmodules -p$(MODULES_PACKAGE_NAME)
+	for i in $(XEN_VERSIONS); do echo $$i >> $(PACKAGE_DIR)/var/lib/$(PACKAGE_NAME)/xen-versions; done
+	install -d $(PACKAGE_DIR)/DEBIAN
+	echo /var/lib/$(PACKAGE_NAME)/xen-versions >> $(PACKAGE_DIR)/DEBIAN/conffiles
 	$(MAKE) -f debian/rules.real install-base
 
 install-patch: PACKAGE = linux-patch-debian-$(VERSION)