Re: Trial git RPM's..

[Chris Wright <chrisw@osdl.org>]

* Linus Torvalds (torvalds@osdl.org) wrote:
> On Mon, 11 Jul 2005, Eric W. Biederman wrote:
> > 
> > A couple of pieces.  The dist target has assumes git-tar-tree is in the
> > path.  Making it so you have to have git installed to build the rpm.
> 
> Yes. Maybe we could relax that requirement by using "./git-tar-tree" or 
> something? That still requires that you have _built_ git to do the rpm, 
> but at least you won't have had to install it.
> 
> Does that fit the rpm build process? Or does an rpm build make something 
> like that really inconvenient? I don't know, patches welcome.

No, that could be done.  It's not the rpmbuild at that point, it's just
prepping to do the rpmbuild.  It's only an issue for those that are trying
to build an rpm directly from the git source and who've never installed
git before.  Doesn't seem necessary to me, I'm not that fond of it (will
even slightly slow down make dist process if it's done from a clean,
i.e. make clean, dir), but hey...the trivial patch below does this.

> > And it does not pass my torture test of building rpm's on debian,
> > but that is not a huge problem.
> 
> Ok, why is debian problematic? Is there some missing dependency or 
> something? I really haven't ever done an rpm, and the git rpm target was 
> all done by Chris Wright, so I don't have any clue at all. Again, patches 
> welcome.

Heh debian rpm build...I missed that bit in Eric's message.  Eric, care
to give details?

thanks,
-chris
--



Use git-tar-tree directly from git source during make dist.  This
handles bootstrap issue with git not being installed.

Signed-off-by: Chris Wright <chrisw@osdl.org>
---

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -175,8 +175,8 @@ git.spec: git.spec.in
 	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
 
 GIT_TARNAME=git-$(GIT_VERSION)
-dist: git.spec
-	git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
+dist: git.spec git-tar-tree
+	./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
 	@mkdir -p $(GIT_TARNAME)
 	@cp git.spec $(GIT_TARNAME)
 	tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec