aboutsummaryrefslogtreecommitdiff
path: root/Makefile.main
diff options
context:
space:
mode:
authorCyril Bur <cyril.bur@au1.ibm.com>2015-05-22 13:52:56 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-06-01 17:15:56 +1000
commitf88b687a0d705001d4d9150d78328ca05b882225 (patch)
tree59305fed8052ac676a699586e26c8ab84a19f6bf /Makefile.main
parent43eee0f2056c36b942365087ee5a49b50e87388e (diff)
downloadskiboot-f88b687a0d705001d4d9150d78328ca05b882225.zip
skiboot-f88b687a0d705001d4d9150d78328ca05b882225.tar.gz
skiboot-f88b687a0d705001d4d9150d78328ca05b882225.tar.bz2
Have make_version be able to generate versions for tools
The goal here is to be able to set tags for versions to some of the userspace tools that are kept in this repository. For this to work, make_version must be able to generate a version for a tag prefix not just the last tag in the repo. The new usage of make_version is to specify a tag prefix when calling it so that it knows what tag to look for. This option is ignored if not in a git repository and the current behaviour of relying on a .version file or $SKIBOOT_VERSION variable remains. Signed-off-by: Cyril Bur <cyril.bur@au1.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile.main')
-rw-r--r--Makefile.main2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.main b/Makefile.main
index 7687d9e..7924cf6 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -153,7 +153,7 @@ $(SUBDIRS):
# Set V=1 if you want to see everything.
include $(SRC)/Makefile.rules
-VERSION ?= $(shell cd $(SRC); GIT_DIR=$(SRC)/.git $(SRC)/make_version.sh)
+VERSION ?= $(shell cd $(SRC); GIT_DIR=$(SRC)/.git $(SRC)/make_version.sh skiboot)
.PHONY: VERSION-always
.version: VERSION-always