diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-08-19 12:43:42 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-08-19 12:43:42 -0400 |
| commit | 12189cca7be5a967a7eccd808fe144d26f404bcb (patch) | |
| tree | 59f05d2ac3c97ea4ce6274fb883e061f9b8ab20f /scripts | |
| parent | b8be8d281587cbed6f5fbf5133c4d7cc1951ea6b (diff) | |
| parent | 204e0cb825de1d221b7b33a5766bd47be6d4ec06 (diff) | |
| download | vyos-build-12189cca7be5a967a7eccd808fe144d26f404bcb.tar.gz vyos-build-12189cca7be5a967a7eccd808fe144d26f404bcb.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-vmware-image | 2 | ||||
| -rwxr-xr-x | scripts/make-version-file | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image index dc680378..665d0f58 100755 --- a/scripts/build-vmware-image +++ b/scripts/build-vmware-image @@ -196,7 +196,7 @@ openssl sha1 *.vmdk *.ovf > vyos_vmware_image.mf # Convert the OVF to signed OVA... echo 'Converting the OVF to signed OVA...' -private_key=${PRIVATE_KEY_PATH:-"../../key/privatekey.pem"} +private_key=${PRIVATE_KEY_PATH:-"../key/privatekey.pem"} if [ ! -f ${private_key} ]; then echo 'Please put your key to "key/privatekey.pem" in repository root, or set PRIVATE_KEY_PATH to environment variables.' exit 1 diff --git a/scripts/make-version-file b/scripts/make-version-file index 4df2cb6c..fa632eed 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -64,7 +64,7 @@ if build_config['build_type'] == 'development': git_branch = repo.active_branch.name branch_version = version_mapping[git_branch] - version = "{0}-rolling+{1}".format(branch_version, build_timestamp) + version = "{0}-rolling-{1}".format(branch_version, build_timestamp) except Exception as e: print("Could not build a version string specific to git branch, falling back to default: {0}".format(str(e))) version = "999.{0}".format(build_timestamp) |