[Pkg-libvirt-discuss] Updating libvirt to 5.2.0

[Guido Günther]

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

> 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.

> 
>   --- a/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
>   +++ b/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
>   @@ -9,10 +9,10 @@ Issue reported upstresm.
>     gnulib/tests/test-nonblocking-pipe.sh | 4 ++++
>     1 file changed, 4 insertions(+)
>   
>   -diff --git a/gnulib/tests/test-nonblocking-pipe.sh b/gnulib/tests/test-nonblocking-pipe.sh
>   -index dd692be..9690791 100755
>   ---- a/gnulib/tests/test-nonblocking-pipe.sh
>   -+++ b/gnulib/tests/test-nonblocking-pipe.sh
>   +Index: libvirt/gnulib/tests/test-nonblocking-pipe.sh
>   +===================================================================
>   +--- libvirt.orig/gnulib/tests/test-nonblocking-pipe.sh
>   ++++ libvirt/gnulib/tests/test-nonblocking-pipe.sh
>    @@ -1,5 +1,9 @@
>     #!/bin/sh
> 
> so I guess you're doing it differently? I see a 'gbp pq' command
> exists, and there's some configuration for it in debian/gbp.conf,
> but from the man page I seem to understand there should be a git
> branch where the patches are stored, and I can't see it on Salsa.

The git branch is purely local what matters to the Debian package is
what's in debian/patches (to not enforce any specific tooling to deal
with the package):

     http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.patches.html

> I tried generating the branch locally with 'gbp pq import' followed
> by 'gbp pq rebase' and 'gbp pq export', and it seemed to have
> worked and matched your own patch refreshing commits... Is this the
> expected workflow?

That's at least what I'm doing over here but quilt should work as well
if you prefer that.

Cheers,
 -- Guido

> 


> 
> Thanks and sorry for the slight rambling :)
> 
> -- 
> Andrea Bolognani <eof at kiyuko.org>
> Resistance is futile, you will be garbage collected.