make mkpatches

make mkpatches

[James Harper]

'make mkpatches' gives me a patch which, when applied to a pristine
2.6.12 kernel, doesn't compile. It complains about a missing file
'smp_alt.h'. 
This is against xen-unstable checked out about 12 hours ago, and I'm
trying to make something that debian can use as a patch.

Thanks

James

Re: make mkpatches

[Chris Wright]

* James Harper (james.harper@bendigoit.com.au) wrote:
> 'make mkpatches' gives me a patch which, when applied to a pristine
> 2.6.12 kernel, doesn't compile. It complains about a missing file
> 'smp_alt.h'. 
> This is against xen-unstable checked out about 12 hours ago, and I'm
> trying to make something that debian can use as a patch.

Sounds like you're not picking up the patches that get applied to the
base tree from patches/linux-2.6.12/  (btw, the smp_alts.patch won't
compile on plain x86, it's missing a trivial fix).

RE: make mkpatches

[James Harper]

> 
> Sounds like you're not picking up the patches that get applied to the
> base tree from patches/linux-2.6.12/  (btw, the smp_alts.patch won't
> compile on plain x86, it's missing a trivial fix).

That sounds plausible. I assumed that mkpatches would do this. Should I
apply these patches/linux-2.6.12/* before or after applying the
mkpatches-generated patch?

Thanks

James

Re: make mkpatches

[Chris Wright]

* James Harper (james.harper@bendigoit.com.au) wrote:
> > 
> > Sounds like you're not picking up the patches that get applied to the
> > base tree from patches/linux-2.6.12/  (btw, the smp_alts.patch won't
> > compile on plain x86, it's missing a trivial fix).
> 
> That sounds plausible. I assumed that mkpatches would do this. Should I
> apply these patches/linux-2.6.12/* before or after applying the
> mkpatches-generated patch?

Apply them before the mkpatches patch.

RE: make mkpatches

[James Harper]

> -----Original Message-----
> From: Chris Wright [mailto:chrisw@osdl.org]
> Sent: Friday, 23 September 2005 11:59
> To: James Harper
> Cc: Chris Wright; Xen-devel@lists.xensource.com
> Subject: Re: [Xen-devel] make mkpatches
> 
> * James Harper (james.harper@bendigoit.com.au) wrote:
> > >
> > > Sounds like you're not picking up the patches that get applied to
the
> > > base tree from patches/linux-2.6.12/  (btw, the smp_alts.patch
won't
> > > compile on plain x86, it's missing a trivial fix).
> >
> > That sounds plausible. I assumed that mkpatches would do this.
Should I
> > apply these patches/linux-2.6.12/* before or after applying the
> > mkpatches-generated patch?
> 
> Apply them before the mkpatches patch.

I tried them the other way around and it worked too. I guess the patches
don't tread on each other much. The mkpatches patch said it should be
applied to a pristine kernel tree.

It seems to be compiling now. Quite a few 'implicit declaration of
function ...' and '... is deprecated' warnings, but no errors so far.
Thanks.

James

RE: make mkpatches

[Ian Pratt]

> 'make mkpatches' gives me a patch which, when applied to a pristine
> 2.6.12 kernel, doesn't compile. It complains about a missing 
> file 'smp_alt.h'. 
> This is against xen-unstable checked out about 12 hours ago, 
> and I'm trying to make something that debian can use as a patch.

You also need to apply the patches in patches/linux-2.6.12

Ian

make mkpatches

[Shaun R.]

What happened to `make mkpatches`, i need to generate a patch to use against
vanilla kernels?

~Shaun 

Re: make mkpatches

[Ian Campbell]

On Tue, 2008-05-06 at 09:49 -0700, Shaun R. wrote:
> What happened to `make mkpatches`, i need to generate a patch to use against
> vanilla kernels?

I guess it went away when the sparse tree was split out from the main
repository into linux-2.6.18-xen.hg

There is a tag for v2.6.18 in that tree so "hg diff -r v2.6.18" should
produce the patch you want.

Ian.

RE: make mkpatches

[Ian Campbell]

On Wed, 2008-05-07 at 10:19 -0700, Shaun wrote:
> Is that going to give me a old patch?

It'll give you a patch from 2.6.18 to the version of 2.6.18-xen.hg which
you have checked out, i.e. as recent as you like.

> Also whats the current tree doing now, is it coming with the kernel source
> already modified?

linux-2.6.18-xen is a tree with all the xen stuff already applied.

The xen-unstable and xen-3.2 trees checkout linux-2.6.18-xen.hg
automatically and build that instead of the old sparse tree (which no
longer exists).

Ian.


> 
> ~Shaun
> 
> 
> -----Original Message-----
> From: Ian Campbell [mailto:Ian.Campbell@citrix.com] 
> Sent: Wednesday, May 07, 2008 1:04 AM
> To: Shaun R.
> Cc: xen-devel@lists.xensource.com
> Subject: Re: [Xen-devel] make mkpatches
> 
> 
> On Tue, 2008-05-06 at 09:49 -0700, Shaun R. wrote:
> > What happened to `make mkpatches`, i need to generate a patch to use
> against
> > vanilla kernels?
> 
> I guess it went away when the sparse tree was split out from the main
> repository into linux-2.6.18-xen.hg
> 
> There is a tag for v2.6.18 in that tree so "hg diff -r v2.6.18" should
> produce the patch you want.
> 
> Ian.
> 
> 
>