Next try. [commit message snipped]
In addition to the changes requested by Peter, I also added support for EXPORTDIR to avoid polluting the flashrom directory.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: flashrom-packaging_export/Makefile =================================================================== --- flashrom-packaging_export/Makefile (Revision 555) +++ flashrom-packaging_export/Makefile (Arbeitskopie) @@ -12,6 +12,7 @@ PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Os -Wall -Werror +EXPORTDIR ?= .
OS_ARCH = $(shell uname) ifneq ($(OS_ARCH), SunOS) @@ -40,9 +41,14 @@
# Set the flashrom version string from the highest revision number # of the checked out flashrom files. -SVNDEF := -D'FLASHROM_VERSION="0.9.0-r$(shell svnversion -cn . \ - | sed -e "s/.*://" -e "s/([0-9]*).*/\1/")"' +# Note to packagers: Any tree exported with "make export" or "make tarball" +# will not require subversion. The downloadable snapshots are already exported. +SVNVERSION := $(shell LANG=C svnversion -cn . | sed -e "s/.*://" -e "s/([0-9]*).*/\1/" | grep "[0-9]" || echo unknown)
+VERSION := 0.9.0-r$(SVNVERSION) + +SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' + $(PROGRAM): $(OBJS) $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
@@ -80,6 +86,17 @@ $(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8
-.PHONY: all clean distclean dep pciutils +export: + @rm -rf $(EXPORTDIR)/flashrom-$(VERSION) + @svn export -r BASE . $(EXPORTDIR)/flashrom-$(VERSION) + @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(VERSION)/Makefile + @echo Exported $(EXPORTDIR)/flashrom-$(VERSION)/
+tarball: export + @tar cfz $(EXPORTDIR)/flashrom-$(VERSION).tar.gz -C $(EXPORTDIR)/ flashrom-$(VERSION)/ + @rm -rf $(EXPORTDIR)/flashrom-$(VERSION) + @echo Created $(EXPORTDIR)/flashrom-$(VERSION).tar.gz + +.PHONY: all clean distclean dep pciutils export tarball + -include .dependencies Index: flashrom-packaging_export/README =================================================================== --- flashrom-packaging_export/README (Revision 555) +++ flashrom-packaging_export/README (Arbeitskopie) @@ -15,6 +15,25 @@ (see http://coreboot.org for details on coreboot)
+Packaging +--------- + +To package flashrom and remove dependencies on subversion, either use +make export +or +make tarball + +make export will export all flashrom files from the subversion repository at +revision BASE into a directory named $EXPORTDIR/flashrom-$VERSION-r$SVNREVISION +and will additionally modify the Makefile in that directory to contain the svn +revision of the exported tree. + +make tarball will simply tar up the result of make export and gzip compress it. + +The snapshot tarballs are the result of make tarball and require no further +processing. + + Build Instructions ------------------