[Pkg-xen-devel] [PATCH] Build against linux-support-2.6.32-2

[Ian Campbell]

To build in current unstable (and, I suspect, squeeze) xen-3 seems to
need the following patch. (I'm not really sure what I'm doing and just
cribbed from r14469 in the debian-kernel tree which is where the
pertinent change to the linux-support package came from. It seems to
work....)

The errors from only editing rules.defs are attached.

Index: debian/bin/gencontrol.py
===================================================================
--- debian/bin/gencontrol.py	(revision 706)
+++ debian/bin/gencontrol.py	(working copy)
@@ -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,7 +60,11 @@
 
     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'),
         ):
Index: debian/rules.defs
===================================================================
--- debian/rules.defs	(revision 706)
+++ debian/rules.defs	(working copy)
@@ -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
Index: debian/arch/i386/defines
===================================================================
--- debian/arch/i386/defines	(revision 706)
+++ debian/arch/i386/defines	(working copy)
@@ -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
Index: debian/arch/amd64/defines
===================================================================
--- debian/arch/amd64/defines	(revision 706)
+++ debian/arch/amd64/defines	(working copy)
@@ -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
 


-- 
Ian Campbell

panic: kernel trap (ignored)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: linux-support-2.6.32.log
Type: text/x-log
Size: 3930 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-xen-devel/attachments/20100218/53654803/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/pkg-xen-devel/attachments/20100218/53654803/attachment.pgp>