On Mon, 2009-03-23 at 17:36 -0300, Otavio Salvador wrote: > On Mon, Mar 23, 2009 at 5:12 PM, Ian Campbell <i...@hellion.org.uk> wrote: > > Could we also include this patch since 2.6.27+ supports Xen domU on > > amd64 as well, this is the equivalent to r54357 for i386. > > > > diff --git > > a/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/nic-modules > > b/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/nic-modules > > index 2512e83..fe57a1f 100644 > > --- a/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/nic-modules > > +++ b/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/nic-modules > > @@ -1 +1,2 @@ > > #include <nic-modules> > > +xen-netfront ? > > diff --git > > a/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/scsi-modules > > b/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/scsi-modules > > index 8909dfb..38bc883 100644 > > --- a/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/scsi-modules > > +++ b/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/scsi-modules > > @@ -1 +1,2 @@ > > #include <scsi-modules> > > +xen-blkfront ? > > It looks like the best way to do that is to add them to kernel-wedge as > optional > and let them to be included on the images.
IIRC I was asked to add direct to i386 instead of adding to kernel
wedge. Maybe that was because i386 was the only one back then though and
for two arches kernel-wedge makes sense. The only other (currently)
potential arch is ia64 though.
In any case the alternative patch is below.
Ian.
diff --git a/packages/kernel/kernel-wedge/debian/changelog
b/packages/kernel/kernel-wedge/debian/changelog
index d13b529..45fa409 100644
--- a/packages/kernel/kernel-wedge/debian/changelog
+++ b/packages/kernel/kernel-wedge/debian/changelog
@@ -1,7 +1,11 @@
kernel-wedge (2.54) UNRELEASED; urgency=low
+ [ Colin Watson ]
* Add ext4-modules.
+ [ Ian Campbell ]
+ * Add Xen disk and network modules.
+
-- Colin Watson <cjwat...@debian.org> Tue, 03 Mar 2009 09:45:52 +0000
kernel-wedge (2.53) unstable; urgency=low
diff --git a/packages/kernel/kernel-wedge/modules/nic-modules
b/packages/kernel/kernel-wedge/modules/nic-modules
index aa79509..16f0d8c 100644
--- a/packages/kernel/kernel-wedge/modules/nic-modules
+++ b/packages/kernel/kernel-wedge/modules/nic-modules
@@ -8,3 +8,4 @@ tg3 ?
tulip
winbond-840
eth1394 ?
+xen-netfront ?
diff --git a/packages/kernel/kernel-wedge/modules/scsi-modules
b/packages/kernel/kernel-wedge/modules/scsi-modules
index afb5f27..89471c3 100644
--- a/packages/kernel/kernel-wedge/modules/scsi-modules
+++ b/packages/kernel/kernel-wedge/modules/scsi-modules
@@ -36,3 +36,4 @@ qlogicfas408 ?
dc395x ?
aic94xx ?
stex ?
+xen-blkfront ?
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
b/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
index e5583b5..35f3ea3 100644
--- a/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
+++ b/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
@@ -1,7 +1,11 @@
linux-kernel-di-i386-2.6 (1.77) UNRELEASED; urgency=low
+ [ Frans Pop ]
* Remove myself as uploader.
+ [ Ian Campbell ]
+ * Remove Xen modules, they have been added to kernel wedge.
+
-- Frans Pop <f...@debian.org> Sat, 28 Feb 2009 16:26:14 +0100
linux-kernel-di-i386-2.6 (1.76) unstable; urgency=low
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-modules
b/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-modules
index fe57a1f..2512e83 100644
--- a/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-modules
+++ b/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-modules
@@ -1,2 +1 @@
#include <nic-modules>
-xen-netfront ?
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/scsi-modules
b/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/scsi-modules
index 38bc883..8909dfb 100644
--- a/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/scsi-modules
+++ b/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/scsi-modules
@@ -1,2 +1 @@
#include <scsi-modules>
-xen-blkfront ?
--
Ian Campbell
"...a most excellent barbarian ... Genghis Kahn!"
-- _Bill And Ted's Excellent Adventure_
signature.asc
Description: This is a digitally signed message part
