[git-buildpackage] Bug#771215: git-buildpackage: please merge support for gbp pq-rpm

Guido Günther agx at sigxcpu.org
Fri Jan 9 10:47:27 CET 2015


On Mon, Dec 29, 2014 at 03:41:28PM +0200, Markus Lehtonen wrote:
> Hi,
> 
> On 28/12/14 14:29, "Guido Günther" <agx at sigxcpu.org> wrote:
> 
> >Hi Markus,
> >thanks a lot for the update!
> >
> >On Tue, Dec 16, 2014 at 10:09:15AM +0200, Markus Lehtonen wrote:
> >[..snip..]
> >> 
> >> You can find a patch with updated unit tests attached. I also updated
> >> and rebased my feature/pq-rpm branch in Github.
> >
> >Can you give a hint what --import-files will be used for? It's already
> >a bit sad the we have different branches (packaging vs upstream) for
> >the deb and rpm version and --import-files seems to try to
> >mitigate this a bit?
> 
> Basically, yes. For RPM-only packages (i.e. only rpm packaging is
> maintained) it doesn't make much sense to have the upstream source code in
> the packaging branch, IMO. The source code from the packaging branch
> is

Can you point me to a public repo that is RPM-only and one that is
not. I'd like to better understand the workflows involved.

> not used for anything and might even create confusion amongst developers
> (making source code changes in packaging branch will have no effect on the
> build). The patches are always imported on top of the upstream version
> (instead of the packaging branch) because the packaging branch might not
> even have source code. One complication of this is that the .gbp.conf
> file(s) that might be present in the pacakging branch are not
> automatically present in the pq-branhc. The --import-files option is
> basically to mitigate this.

If this is the major use case we should probably just look at the
corresponding packaging branch for .gbp.conf options? In Debian we
actually don't use .gbp.conf since this would create a modified
upstream source and prefer debian/gbp.conf.


> Any thoughts on this? I think we're still in such an early phase of
> gbp-rpm that we could change things.

I do need to understand the different models better by looking at some
actual repos and building them. Any pointers greatly appreciated!
Cheers,
 -- Guido


More information about the git-buildpackage mailing list