From ec7a35f7ec8be2cb541de86263a35b1d54206a6b Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Thu, 29 Aug 2013 00:38:14 +0000 Subject: Improve getrevision.sh - remove bashism. - simplify some git-related code. - improved parameter and error handling. - additional -d/--date action which is similar to the timestamp action. - support for an optional path parameter. - there is only one sane time format. - and only one sane date format too. - use UTC dates and times only. - vastly improve git_url() to print the correct remote url and "nearest" branch. - remove username from repository URLs. - add "-dirty" to local revisions if there are uncommitted changes. - indicate in local revisions how many git-only commits were done since branching from upstream svn. - fix svn_revision() fallback to svn info and remove git-svn. - print leading r in script instead of hardcode it in the makefile; no more "0.9.7-runknown". - make retrieving the upstream revision work even in cloned git-svn repositories. - more abstractions and helper functions. - less fragmentation of actual functionality. Corresponding to flashrom svn r1727. Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5410a71..f34ed1d 100644 --- a/Makefile +++ b/Makefile @@ -333,14 +333,13 @@ LIB_OBJS = layout.o flashrom.o udelay.o programmer.o CLI_OBJS = cli_classic.o cli_output.o print.o -# Set the flashrom version string from the highest revision number -# of the checked out flashrom files. +# Set the flashrom version string from the highest revision number of the checked out flashrom files. # Note to packagers: Any tree exported with "make export" or "make tarball" # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell ./util/getrevision.sh -u) RELEASE := 0.9.7 -VERSION := $(RELEASE)-r$(SVNVERSION) +VERSION := $(RELEASE)-$(SVNVERSION) RELEASENAME ?= $(VERSION) SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' -- cgit v1.1