summaryrefslogtreecommitdiffstats
path: root/make_version.sh
Commit message (Collapse)AuthorAgeFilesLines
* make_version: Fix check for '.version' fileVaibhav Jain2017-11-211-1/+1
| | | | | | | | | | | | | | | | | | | When building from the non-git tree and with '.version' file missing, make_version shows this bash error message. % make ... cat: .version: No such file or directory ... error You need to set SKIBOOT_VERSION environment variable This patch fixes this issue by updating '.version' file check in make_version script to test if it exists as a regular file and is of non-zero size. Fixes: 6a3cad272e4c("Add fallback to .version if not git and no SKIBOOT_VERSION") Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
* versioning: Unify all versioning to match skiboot versionsCyril Bur2015-07-311-22/+15
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* support make_version.sh not having tags, this tripped up travis-ciStewart Smith2015-06-261-3/+1
| | | | Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
* Have make_version be able to generate versions for toolsCyril Bur2015-06-011-3/+29
| | | | | | | | | | | | | | | | 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>
* skiboot: detect version correctly as a git submoduleAndrei Warkentin2015-05-181-1/+1
| | | | | | | When checked-out as a submodule, .git is a file, not a dir. Signed-off-by: Andrei Warkentin <andrey.warkentin@gmail.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
* Add fallback to .version if not git and no SKIBOOT_VERSIONStewart Smith2015-05-011-1/+6
| | | | Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
* Implement skiboot versioningStewart Smith2014-11-191-0/+38
We grab a version from git tags (or SKIBOOT_VERSION environment variable), optionally tack on EXTRA_VERSION (if from git) as well as add things to the git version number if we're ahead of the most recent tag or the tree is dirty. Also fix-up makefiles so that we don't have to rebuild version.c every time you run make. fsp attn area needed updating as we can have >40 character version strings. We also export the version string via device tree rather than just the gitid. For buildroot builds, setting SKIBOOT_VERSION environment variable to the tag you grab will do the correct thing. Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
OpenPOWER on IntegriCloud