Submitter | Carl-Daniel Hailfinger |
---|---|
Date | 2009-08-31 15:24:42 |
Message ID | <4A9BEB3A.4020801@gmx.net> |
Download | mbox | patch |
Permalink | /patch/232/ |
State | Accepted |
Commit | r704 |
Headers | show |
Comments
On 8/31/09 5:24 PM, Carl-Daniel Hailfinger wrote: > With this patch, make tarball and make export still work as expected, > but if you specify RELEASENAME=foo, then the directories and tarballs > are named flashrom-foo instead of flashrom-0.9.0-r703. > This makes release creation a lot easier. As an example, look at > creating the 0.9.1 tarball: > # make tarball RELEASENAME=0.9.1 > > Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> > Acked-by: Stefan Reinauer <stepan@coresystems.de> When's 0.9.1 coming? Shouldn't the RELEASE be 0.9.1rc1 already or something? Stefan > Index: flashrom-releasepackaging/Makefile > =================================================================== > --- flashrom-releasepackaging/Makefile (Revision 703) > +++ flashrom-releasepackaging/Makefile (Arbeitskopie) > @@ -60,7 +60,9 @@ > # will not require subversion. The downloadable snapshots are already exported. > SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]" || echo unknown) > > -VERSION := 0.9.0-r$(SVNVERSION) > +RELEASE := 0.9.0 > +VERSION := $(RELEASE)-r$(SVNVERSION) > +RELEASENAME ?= $(VERSION) > > SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' > > @@ -146,16 +148,16 @@ > $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 > > export: > - @rm -rf $(EXPORTDIR)/flashrom-$(VERSION) > - @svn export -r BASE . $(EXPORTDIR)/flashrom-$(VERSION) > - @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(VERSION)/Makefile > - @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(VERSION)/ChangeLog > - @echo Exported $(EXPORTDIR)/flashrom-$(VERSION)/ > + @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME) > + @svn export -r BASE . $(EXPORTDIR)/flashrom-$(RELEASENAME) > + @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile > + @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(RELEASENAME)/ChangeLog > + @echo Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/ > > tarball: export > - @tar cjf $(EXPORTDIR)/flashrom-$(VERSION).tar.bz2 -C $(EXPORTDIR)/ $(TAROPTIONS) flashrom-$(VERSION)/ > - @rm -rf $(EXPORTDIR)/flashrom-$(VERSION) > - @echo Created $(EXPORTDIR)/flashrom-$(VERSION).tar.bz2 > + @tar cjf $(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2 -C $(EXPORTDIR)/ $(TAROPTIONS) flashrom-$(RELEASENAME)/ > + @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME) > + @echo Created $(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2 > > .PHONY: all clean distclean dep compiler pciutils features export tarball > > > >
On 31.08.2009 17:36, Stefan Reinauer wrote: > On 8/31/09 5:24 PM, Carl-Daniel Hailfinger wrote: > >> specify RELEASENAME=foo, then the directories and tarballs >> are named flashrom-foo instead of flashrom-0.9.0-r703. >> This makes release creation a lot easier. >> >> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> >> > > Acked-by: Stefan Reinauer <stepan@coresystems.de> > Thanks, r704. > When's 0.9.1 coming? > Today. This was the last commit before changing the version number and tagging. > Shouldn't the RELEASE be 0.9.1rc1 already or something? > Good point, but given that quite a few packaging systems think that 0.9.1rc1 is newer than 0.9.1, I thought it would be best leaving the release number alone until we're ready to tag. Regards, Carl-Daniel
Patch
Index: flashrom-releasepackaging/Makefile =================================================================== --- flashrom-releasepackaging/Makefile (Revision 703) +++ flashrom-releasepackaging/Makefile (Arbeitskopie) @@ -60,7 +60,9 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]" || echo unknown) -VERSION := 0.9.0-r$(SVNVERSION) +RELEASE := 0.9.0 +VERSION := $(RELEASE)-r$(SVNVERSION) +RELEASENAME ?= $(VERSION) SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' @@ -146,16 +148,16 @@ $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 export: - @rm -rf $(EXPORTDIR)/flashrom-$(VERSION) - @svn export -r BASE . $(EXPORTDIR)/flashrom-$(VERSION) - @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(VERSION)/Makefile - @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(VERSION)/ChangeLog - @echo Exported $(EXPORTDIR)/flashrom-$(VERSION)/ + @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME) + @svn export -r BASE . $(EXPORTDIR)/flashrom-$(RELEASENAME) + @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile + @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(RELEASENAME)/ChangeLog + @echo Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/ tarball: export - @tar cjf $(EXPORTDIR)/flashrom-$(VERSION).tar.bz2 -C $(EXPORTDIR)/ $(TAROPTIONS) flashrom-$(VERSION)/ - @rm -rf $(EXPORTDIR)/flashrom-$(VERSION) - @echo Created $(EXPORTDIR)/flashrom-$(VERSION).tar.bz2 + @tar cjf $(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2 -C $(EXPORTDIR)/ $(TAROPTIONS) flashrom-$(RELEASENAME)/ + @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME) + @echo Created $(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2 .PHONY: all clean distclean dep compiler pciutils features export tarball
With this patch, make tarball and make export still work as expected, but if you specify RELEASENAME=foo, then the directories and tarballs are named flashrom-foo instead of flashrom-0.9.0-r703. This makes release creation a lot easier. As an example, look at creating the 0.9.1 tarball: # make tarball RELEASENAME=0.9.1 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>