[git-buildpackage] git-buildpackage-rpm patchset 2015-11-20

[Markus Lehtonen]

Hi,

On Mon, 2015-11-23 at 16:09 +0200, Markus Lehtonen wrote:
> Hi,
> 
> On Fri, 2015-11-20 at 18:38 +0100, Guido Günther wrote:
> > Hi,
> > On Fri, Nov 20, 2015 at 04:39:44PM +0200, Markus Lehtonen wrote:
> > > Hello,
> > > 
> > > I've rebased my patchset(s) at https://github.com/marquiz/git-buildpackage-rpm. The list of branches is the usual:
> > >   experimental-rpm
> > >   feature/argparse
> > >   feature/buildpackage-rpm
> > >   feature/fixes
> > >   feature/import-srpm
> > >   feature/misc
> > >   feature/pq-rpm
> > >   feature/python-pkg-resources
> > > 
> > > The 'feature/fixes' branch contains few new fixes that should be quite straightforward to merge.
> > 
> > I have pulled
> > 
> >   82999a8ae42477db4c7e2bc6dee7d5f1c3f6c6a0 docs: enable building html docs with docbook2html
> >   1fdb6976b3c32828afa2571cdcc95136f70f9b4f buildpackage-rpm: fix crash when creating packaging tags
> >   ac020c3e104e2057ae8e9e7b5f95dbe9c12f61ef rpm packaging: bump package version to 0.7.0
> 
> Great, thanks!
> 
> 
> > Thanks a lot! I'll try to find some to look into the other stuff but
> > things are currently piling a bit up here.
> > 
> > I have left out
> > 
> >     tests: update rpm test data submodule to a valid commit
> > 
> > for the moment since it seems I have a valid commit here
> 
> I don't think so as .gitmodules still points to my github repo
> (git://github.com/marquiz/git-buildpackage-rpm-testdata.git) which does
> not contain the commit:
> $ git clone --mirror -q
> git://github.com/marquiz/git-buildpackage-rpm-testdata.git
> $ cd git-buildpackage-rpm-testdata.git/
> $ git show bea3aa372447b2fca611f187c2daa55edd8cdb3f
> fatal: bad object bea3aa372447b2fca611f187c2daa55edd8cdb3f
> 
> 
> > and I think we
> > need to rethink the strategy for this submodule. For the deb component
> > tests I'm keeping everything in HEAD and set up everything from
> > there. The rpm tests need different commits to function which causes/caused
> > some breakackge here when pulling in more component tests so I think we
> > would be better of needing only a single commit like in the deb
> > case. Would that be doable?
> 
> I haven't figured out any better way – although I admit that this is not
> the most elegant solution. The other branches in the testdata repository
> basically represent various test packages (i.e. test repositories can be
> constructed from those). I didn't find any nice and easy way to
> serialize the test repositories (to construct them at test time) either.
> And additional git submodules (per-testpackage submodule) don't work
> either because the test repositories usually require multiple branches
> (upstream, packaging, pristine-tar) and this is not supported in git
> submodules which work on single HEAD commit. Better ideas are welcome,
> of course.

I played around with one idea I had earlier and came up with a solution
to the problem of storing test package git repositories. Please see the
'feature/component-tests' branch in my Github repository
https://github.com/marquiz/git-buildpackage-rpm

Now, all test data is available in submodule 'HEAD' - test package git
repositories are serialized as patches (and some additional data) in
separate subdiretories. The branch also contains two patches for
buildpackage-rpm (cherry-picked from the 'feature/buildpackage-rpm'
branch) that are needed for the buildpackage-rpm unit tests to pass. It
also contains one "optional" patch that makes names of the per-testcase
temporary directories more user friendly.

If you're not going to merge this in the near future, please update the
rpm test data submodule into a valid commit. Currently, it points into
some local commit of yours or something as I pointed out in my earlier
email.



Thanks,
  MArkus