Bastian Blank
2010-Feb-24 14:13 UTC
[Pkg-xen-changes] r707 - in trunk/xen-3/debian: . arch/amd64 arch/i386 bin
Author: waldi
Date: Wed Feb 24 14:13:50 2010
New Revision: 707
Log:
* debian/rules.defs: Use 2.6.32-2.
* debian/arch/amd64/defines, debian/arch/i386/defines,
debian/bin/gencontrol.py: Adopt changes.
Modified:
trunk/xen-3/debian/arch/amd64/defines
trunk/xen-3/debian/arch/i386/defines
trunk/xen-3/debian/bin/gencontrol.py
trunk/xen-3/debian/rules.defs
Modified: trunk/xen-3/debian/arch/amd64/defines
=============================================================================---
trunk/xen-3/debian/arch/amd64/defines Sun Nov 22 15:55:06 2009 (r706)
+++ trunk/xen-3/debian/arch/amd64/defines Wed Feb 24 14:13:50 2010 (r707)
@@ -3,7 +3,7 @@
amd64
xen-arch: x86_64
-[amd64_base]
-class: AMD64
-longclass: all 64bit single- and multiprocessor AMD and Intel
+[amd64_description]
+hardware: AMD64
+hardware-long: all 64bit single- and multiprocessor AMD and Intel
Modified: trunk/xen-3/debian/arch/i386/defines
=============================================================================---
trunk/xen-3/debian/arch/i386/defines Sun Nov 22 15:55:06 2009 (r706)
+++ trunk/xen-3/debian/arch/i386/defines Wed Feb 24 14:13:50 2010 (r707)
@@ -4,9 +4,11 @@
i386
xen-arch: x86_32
+[amd64_description]
+hardware: AMD64
+
[amd64_base]
-class: AMD64
xen-arch: x86_64
-[i386_base]
-class: i386
+[i386_description]
+hardware: i386
Modified: trunk/xen-3/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-3/debian/bin/gencontrol.py Sun Nov 22 15:55:06 2009 (r706)
+++ trunk/xen-3/debian/bin/gencontrol.py Wed Feb 24 14:13:50 2010 (r707)
@@ -25,6 +25,7 @@
def do_arch_setup(self, vars, makeflags, arch, extra):
config_entry = self.config.merge(''base'', arch)
+ config_entry_description =
self.config.merge(''description'', arch)
for i in (
(''xen-arch'', ''XEN_ARCH''),
@@ -59,6 +60,10 @@
def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour,
extra):
config_entry = self.config.merge(''base'', arch,
featureset, flavour)
+ config_description = self.config.merge(''description'',
arch, featureset, flavour)
+
+ vars[''class''] =
config_description[''hardware'']
+ vars[''longclass''] =
config_description.get(''hardware-long'') or
vars[''class'']
for i in (
(''xen-arch'', ''XEN_ARCH''),
Modified: trunk/xen-3/debian/rules.defs
=============================================================================---
trunk/xen-3/debian/rules.defs Sun Nov 22 15:55:06 2009 (r706)
+++ trunk/xen-3/debian/rules.defs Wed Feb 24 14:13:50 2010 (r707)
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.30-1
+KERNELVERSION := 2.6.32-2
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
TEMPLATES_DIR = debian/templates