aboutsummaryrefslogtreecommitdiff
path: root/Makefile.main
diff options
context:
space:
mode:
authorCyril Bur <cyril.bur@au1.ibm.com>2015-07-29 15:25:53 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-07-31 15:32:44 +1000
commit3591fd399c7d76b54ac25075b7617fe9b7de3507 (patch)
treecc003a59e32c18308afa1736f6ebb6e343640c82 /Makefile.main
parent869228384267a2a4f23e563879e2a1f4b16f376e (diff)
downloadskiboot-3591fd399c7d76b54ac25075b7617fe9b7de3507.zip
skiboot-3591fd399c7d76b54ac25075b7617fe9b7de3507.tar.gz
skiboot-3591fd399c7d76b54ac25075b7617fe9b7de3507.tar.bz2
versioning: Unify all versioning to match skiboot versions
Previously there has been some uncertainty as to how separate binaries were to be versioned compared to the firmware version as they could change (or not change) out of sync with skiboot versioning. Historically pflash was born with its own version which didn't help the issue. It has been decided that make_version.sh should always return one version which is shall be the skiboot firmware version, external binaries can supply their own prefix which will be s/skiboot/$prefix/ but the default behaviour is the git tag versioning. The main reason for versioning here is so developers can identify which version of the code someone is running, versions which closly match the source tree are easiest to deal with. The idea with one version and every binary getting a bump regardless of changes is that there is a lot of shared code (libflash/libffs are a prime example) and even if an external binary isn't explicitly updated it is possible that changes to shared code may be missed. This patch simplifies make_version.sh which had been updated to deal with pflash- git tags. 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 3851c20..48d8b8d 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -156,7 +156,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 skiboot)
+VERSION ?= $(shell cd $(SRC); GIT_DIR=$(SRC)/.git $(SRC)/make_version.sh)
.PHONY: VERSION-always
.version: VERSION-always