[Pkg-libvirt-discuss] Updating libvirt to 5.2.0
Guido Günther
agx at sigxcpu.org
Mon Apr 1 19:00:24 BST 2019
Hi,
On Mon, Apr 01, 2019 at 07:40:44PM +0200, Andrea Bolognani wrote:
> On Mon, Apr 01, 2019 at 10:09:44AM +0200, Guido Günther wrote:
> > Hi,
> > On Sun, Mar 31, 2019 at 08:42:49PM +0200, Andrea Bolognani wrote:
> > [..snip..]
> > > I've started looking into the current debian/experimental branch
> > > and I have a question already: how do you usually refresh patches?
> >
> > The machinery here uses:
> >
> > gbp import-orig --uscan
> > gbp pq import --time-machine=3
> > git rebase debian/experimental
> > <manual conflict resolution here if necessary>
> > gbp pq export --commit
> >
> > Or when importing new patches
> >
> > gbp pq import --force
> > git cherry-pick <from-libvirt-upstream>
> > gbp pq export --commit
>
> Okay, that's very similar to what I eventually came up with. I'll
> try some more stuff so that I get comfortable with it.
>
> > > For my other packages I usually have the .pc/ directory committed,
> > > which is not the case for libvirt, and I use 'quilt push' + 'quilt
> > > refresh' after merging a new upstream version, but doing so in the
> > > libvirt repository results in changes like
> >
> > This can also be done with plain quilt since pq aims to be compatible
> > with that.
>
> Unless I'm missing something, not quite. From a fresh clone:
>
> libvirt$ quilt next
> No series file found
QUILT_PATCHES=debian/patches/ quilt push -a
Having .pc in the source tree calls for heaps of problems for everyone
(those using quilt and those using other means). This wiki page has
the setup to get this autodetected:
https://wiki.debian.org/UsingQuilt
But then although it was useful back then I consider quilt a thing of
the 200x years so you won't hear me complaining when you use 'gbp pq'
instead of quilt with the libvirt package.
Cheers,
-- Guido
More information about the Pkg-libvirt-discuss
mailing list