[Pkg-xen-devel] the EXTRAVERSION problem in dh-kpatches...

[Ralph Passgang]

Am Montag, 20. Februar 2006 15:32 schrieb Guido Trotter:
> On Mon, Feb 20, 2006 at 02:58:16PM +0100, Ralph Passgang wrote:
>
> Ciao,
>
> > ... is actually old & very well known by the maintainer!
> >
> > there is a bug report for exactly this that is 3 years and 124 days old!
> > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165505
> >
> > I can also add my report to this bug and mention that we need a fixed
> > version for our xen packages, but as it looks for me (at the moment) the
> > maintainer is not really interessted in getting this "fixed".
>
> I see... let's see if we can work around this...
>
> > P.s.: If we don't remove the EXTRAVERSION from our xen patch, then the
> > exactly error message is:
> >
> > ...
> > dh_install -p xen-docs -X examples
> > --sourcedir=/home/ralphp/build/xen-3.0.1/debian/install
> > dh_installdocs
> > dh_installchangelogs
> > dh_installkpatches
> > Diff file changes EXTRAVERSION: debian/linux-2.6.12-xen.patch
> > at /usr/bin/dh_installkpatches line 99.
> > make: *** [binary] Error 255
>
> It seems a check that the maintainer has put there on purpouse, and thus
> doesn't want to remove... IMHO we can easily work around it: let's
> distribute a patch against linux-2.6.12.6 instead of linux-2.6.12 as xen
> does. For our users nothing changes (they still have to download something
> from kernel.org, I don't think they care if what they need to download is
> linux-2.6.12.tar.bz2 or linux-2.6.12.6.tar.bz2) and we can just apply all
> the xen patches *except* 2.6.12.6.patch and everyone is happy!

I don't think so, because it's not only the ".6" that is added via the 
EXTRAVERSION, but also the "-xen".

These are the lines from the patch file that causes dh_installkpatches to 
abort:

diff -Nurp pristine-linux-2.6.12/Makefile linux-2.6.12-xen/Makefile
--- pristine-linux-2.6.12/Makefile      2005-06-17 21:48:29.000000000 +0200
+++ linux-2.6.12-xen/Makefile   2006-02-20 14:49:40.895212976 +0100
@@ -1,7 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 12
-EXTRAVERSION =
+EXTRAVERSION = .6$(XENGUEST)
+XENGUEST = -xen
 NAME=Woozy Numbat

I manipulated this file by hand so, that it looks like this:

-EXTRAVERSION = .6
+EXTRAVERSION = .6$(XENGUEST)
+XENGUEST = -xen

because this is the way the patch should look like if we have used 2.6.12.6 as 
diff source, but dh_installkpatches still refuses to work with this, because 
the EXTRAVERSION still changes within the patch.

If we want that xen kernels have the typical "-xen" suffix, we need to have 
dh-kpatches "fixed".

--Ralph

> Guido
>
>
> _______________________________________________
> Pkg-xen-devel mailing list
> Pkg-xen-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-xen-devel