# [PATCH] release tarball make targets 5 messages from 2005-05-03 to 2005-05-04. Participants: Mark Allen, Petr Baudis, Chris Wright, H. Peter Anvin. Thread: https://gitlist.dev/t/465 ## Mark Allen, 2005-05-03 21:15 Subject: [PATCH] release tarball make targets Message-ID: <20050503211527.42339.qmail@web41208.mail.yahoo.com> URL: https://gitlist.dev/e/20050503211527.42339.qmail%40web41208.mail.yahoo.com ``` This patch is to support automating RPM and spec file generation. Cheers, --Mark Signed-off-by: Mark Allen Index: Makefile =================================================================== --- aa6233be6d1b8bf42797c409a7c23b50593afc99/Makefile (mode:100644 sha1:6ae0afa0208a8f755d383281a6d049a4ef90fe63) +++ uncommitted/Makefile (mode:100644 sha1:181aa6d6c34fb771671a7ee8038f9cf18972713a) @@ -55,6 +55,10 @@ VERSION= VERSION +DIRS=mozilla-sha1 contrib ppc + +DOCS=README README.reference + LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \ tag.o date.o LIB_FILE=libgit.a @@ -136,3 +140,11 @@ backup: clean cd .. ; tar czvf dircache.tar.gz dir-cache + +release-tar-gzip: clean + tar czf $(shell cat $(VERSION)).tar.gz *.c *.h git.spec Makefile $(DOCS) $(DIRS) $(SCRIPTS) $(SCRIPT) + +release-tar-bzip2: clean + tar cjf $(shell cat $(VERSION)).tar.bz2 *.c *.h git.spec Makefile $(DOCS) $(DIRS) $(SCRIPTS) $(SCRIPT) + +release-tarballs: release-tar-gzip release-tar-bzip2 ``` ## Petr Baudis, 2005-05-03 21:44 Subject: Re: [PATCH 0/3] cogito spec file updates Message-ID: <20050503214401.GE15995@pasky.ji.cz> URL: https://gitlist.dev/e/20050503214401.GE15995%40pasky.ji.cz In-Reply-To: <20050503211527.42339.qmail@web41208.mail.yahoo.com> ``` Dear diary, on Tue, May 03, 2005 at 11:32:16PM CEST, I got a letter where Chris Wright told me that... > * Petr Baudis (pasky@ucw.cz) wrote: > > I might however have some private mkrelease.sh script which would do > > > > echo "$1" >VERSION > > update-spec-file > > echo "$1" | cg-commit > > cg-tag "$1" > > > > or something. > > If you had a Makefile target like the one Mark Allen just posted, would > you use that? No, I definitively won't use that: (i) The created tarball is Evil. It does not contain everything in a subdirectory. (ii) I don't want to have yet another place which I'm supposed to keep up to date with regard to what should be packaged. That's one of the things the SCM is for, and it already records precisely this information, so I'd actually use it. cg-export foo.tar.gz is the perfect tool for this. > I'd simply add a git.spec: rule, and have git.spec built > as a dependency for tarball. I wouldn't accept this neither. If git.spec is already version controlled, it should be up-to-date in the version control. Therefore, you need to update it at the time of release, not at the time of generating the tarball. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor ``` ## Chris Wright, 2005-05-03 23:01 Subject: Re: [PATCH 0/3] cogito spec file updates Message-ID: <20050503230152.GX18917@shell0.pdx.osdl.net> URL: https://gitlist.dev/e/20050503230152.GX18917%40shell0.pdx.osdl.net In-Reply-To: <20050503214401.GE15995@pasky.ji.cz> ``` * Petr Baudis (pasky@ucw.cz) wrote: > I wouldn't accept this neither. If git.spec is already version > controlled, it should be up-to-date in the version control. Therefore, > you need to update it at the time of release, not at the time of > generating the tarball. *shrug* Well, it's guaranteed to be one step out of sync, but I'll just keep doing what I've been doing. Build rpm after you release, and send patch ex-post-facto. thanks, -chris ``` ## H. Peter Anvin, 2005-05-04 14:38 Subject: Re: [PATCH 0/3] cogito spec file updates Message-ID: <4278DE7D.3000005@zytor.com> URL: https://gitlist.dev/e/4278DE7D.3000005%40zytor.com In-Reply-To: <20050503214401.GE15995@pasky.ji.cz> ``` Petr Baudis wrote: > > I wouldn't accept this neither. If git.spec is already version > controlled, it should be up-to-date in the version control. Therefore, > you need to update it at the time of release, not at the time of > generating the tarball. > What I usually do is to have a *.spec.in file, and have my release script generate the *.spec file. I usually have a "version" file checked into the SCM from which all version information derives, including what to put in the *.spec file as well as what to name the subdirectory. The release script then ends up being some variant on: #!/bin/sh -xe PACKAGE=pkgname VERSION=`cat version` scm-of-choice tag --force $PACKAGE-$VERSION mkdir /var/tmp/$PACKAGE-$VERSION cd /var/tmp/$PACKAGE-$VERSION scm-of-choice export -r $PACKAGE-$VERSION make release cd .. tar cvvfz $PACKAGE-$VERSION.tar.gz $PACKAGE-$VERSION rm -rf $PACKAGE-$VERSION ... where "make release" creates the specfile and anything else that needs to be created (like autoconf files.) -hpa ``` ## Chris Wright, 2005-05-04 15:27 Subject: Re: [PATCH 0/3] cogito spec file updates Message-ID: <20050504152709.GG5324@shell0.pdx.osdl.net> URL: https://gitlist.dev/e/20050504152709.GG5324%40shell0.pdx.osdl.net In-Reply-To: <4278DE7D.3000005@zytor.com> ``` * H. Peter Anvin (hpa@zytor.com) wrote: > What I usually do is to have a *.spec.in file, and have my release > script generate the *.spec file. I usually have a "version" file > checked into the SCM from which all version information derives, > including what to put in the *.spec file as well as what to name the > subdirectory. > > The release script then ends up being some variant on: > > #!/bin/sh -xe > PACKAGE=pkgname > VERSION=`cat version` > scm-of-choice tag --force $PACKAGE-$VERSION > mkdir /var/tmp/$PACKAGE-$VERSION > cd /var/tmp/$PACKAGE-$VERSION > scm-of-choice export -r $PACKAGE-$VERSION > make release > cd .. > tar cvvfz $PACKAGE-$VERSION.tar.gz $PACKAGE-$VERSION > rm -rf $PACKAGE-$VERSION > > ... where "make release" creates the specfile and anything else that > needs to be created (like autoconf files.) Yup, that's precisely what I was thinking. I cobbled up an add-on to Mark Allen's patch yesterday, but didn't send it since Pasky didn't seem too interested in the idea. Anyway, here it is to demonstrate the idea. The current setup is definitely workable, just means each release tarball will build a bogus package with rpmbuild -ta. So I just fix up the spec and then build... thanks, -chris -- Autogen git.spec from git.spec.in. Needs patch from Mark Allen. Signed-off-by: Chris Wright --- cogito/Makefile~orig 2005-05-03 14:41:50.000000000 -0700 +++ cogito/Makefile 2005-05-03 15:53:36.000000000 -0700 @@ -126,6 +126,8 @@ @chmod +x $@ endif +git.spec: git.spec.in $(VERSION) + sed -e 's/@@VERSION@@/$(shell cat $(VERSION) | cut -d"-" -f2)/g' < $< > $@ install: $(PROG) $(SCRIPTS) $(SCRIPT) $(GEN_SCRIPT) install -m755 -d $(DESTDIR)$(bindir) @@ -141,10 +143,10 @@ backup: clean cd .. ; tar czvf dircache.tar.gz dir-cache -release-tar-gzip: clean +release-tar-gzip: clean git.spec tar czf $(shell cat $(VERSION)).tar.gz *.c *.h git.spec Makefile $(DOCS) $(DIRS) $(SCRIPTS) $(SCRIPT) -release-tar-bzip2: clean +release-tar-bzip2: clean git.spec tar cjf $(shell cat $(VERSION)).tar.bz2 *.c *.h git.spec Makefile $(DOCS) $(DIRS) $(SCRIPTS) $(SCRIPT) release-tarballs: release-tar-gzip release-tar-bzip2 --- cogito/git.spec~orig 2005-05-03 14:41:59.000000000 -0700 +++ cogito/git.spec 2005-05-03 14:42:55.000000000 -0700 @@ -1,55 +0,0 @@ -Name: cogito -Version: 0.8 -Release: 2 -Vendor: Petr Baudis -Summary: Git core and tools -License: GPL -Group: Development/Tools -URL: http://kernel.org/pub/software/scm/cogito/ -Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.bz2 -Provides: cogito = %{version} -Obsoletes: git -BuildRequires: zlib-devel, openssl-devel, curl-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5 - -%description -GIT comes in two layers. The bottom layer is merely an extremely fast -and flexible filesystem-based database designed to store directory trees -with regard to their history. The top layer is a SCM-like tool which -enables human beings to work with the database in a manner to a degree -similar to other SCM tools (like CVS, BitKeeper or Monotone). - -%prep -%setup -q - -%build - -make - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -/usr/bin/* -%doc README README.reference COPYING Changelog - -%changelog -* Wed Apr 27 2005 Terje Rosten 0.8-2 -- Doc files -- Use %%{_prefix} macro -- Drop -n option to %%setup macro - -* Mon Apr 25 2005 Chris Wright 0.8-1 -- Update to cogito, rename package, move to /usr/bin, update prereqs - -* Mon Apr 25 2005 Chris Wright 0.7-1 -- Update to 0.7 - -* Thu Apr 21 2005 Chris Wright 0.6.3-1 -- Initial rpm build --- cogito/git.spec.in~orig 2005-05-03 14:42:20.000000000 -0700 +++ cogito/git.spec.in 2005-05-03 14:44:19.000000000 -0700 @@ -0,0 +1,58 @@ +Name: cogito +Version: @@VERSION@@ +Release: 1 +Vendor: Petr Baudis +Summary: Git core and tools +License: GPL +Group: Development/Tools +URL: http://kernel.org/pub/software/scm/cogito/ +Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.bz2 +Provides: cogito = %{version} +Obsoletes: git +BuildRequires: zlib-devel, openssl-devel, curl-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5 + +%description +GIT comes in two layers. The bottom layer is merely an extremely fast +and flexible filesystem-based database designed to store directory trees +with regard to their history. The top layer is a SCM-like tool which +enables human beings to work with the database in a manner to a degree +similar to other SCM tools (like CVS, BitKeeper or Monotone). + +%prep +%setup -q + +%build + +make + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +/usr/bin/* +%doc README README.reference COPYING Changelog + +%changelog +* Tue May 3 2005 Chris Wright +- Auto build from git.spec.in + +* Wed Apr 27 2005 Terje Rosten 0.8-2 +- Doc files +- Use %%{_prefix} macro +- Drop -n option to %%setup macro + +* Mon Apr 25 2005 Chris Wright 0.8-1 +- Update to cogito, rename package, move to /usr/bin, update prereqs + +* Mon Apr 25 2005 Chris Wright 0.7-1 +- Update to 0.7 + +* Thu Apr 21 2005 Chris Wright 0.6.3-1 +- Initial rpm build ```