diff options
author | Kali Kaneko <kali@leap.se> | 2016-04-11 17:49:01 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2016-04-11 17:49:01 -0400 |
commit | 5fc9a8c68216bcdd7a4d847e75bac428aafda5e4 (patch) | |
tree | f3285e2cde3819a9bcde074f098e081abdbf511d | |
parent | 977f594510b70c7f0d1c99d1d77c188ff6ba8e37 (diff) |
[bug] hash the installed binaries
this was the cause for the previous alpha releases keep insisting on
re-installing the helper files.
- Resolves: #7989
- Releases: 0.9.2
-rw-r--r-- | pkg/next-version | 2 | ||||
-rw-r--r-- | pkg/pyinst/pyinst-build.mk | 6 | ||||
-rwxr-xr-x | setup.py | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkg/next-version b/pkg/next-version index 8df8fe62..1c3e8a50 100644 --- a/pkg/next-version +++ b/pkg/next-version @@ -1 +1 @@ -0.9.2.alpha3 +0.9.2.alpha4 diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk index 16737ead..348395cc 100644 --- a/pkg/pyinst/pyinst-build.mk +++ b/pkg/pyinst/pyinst-build.mk @@ -3,7 +3,11 @@ freeze-ver: sed -i 's/^version_version\(.*\)/version_version = "$(NEXT_VERSION)"/' src/leap/bitmask/_version.py sed -i 's/^full_revisionid\(.*\)/full_revisionid = "$(GIT_COMMIT)"/' src/leap/bitmask/_version.py -pyinst: freeze-ver +hash-binaries: + # TODO get from a build dir + OPENVPN_BIN=/usr/sbin/openvpn BITMASK_ROOT=pkg/linux/bitmask-root python setup.py hash_binaries + +pyinst: freeze-ver hash-binaries pyinstaller -y pkg/pyinst/bitmask.spec reset-ver: @@ -219,6 +219,7 @@ class cmd_binary_hash(Command): pass def run(self, *args): + # TODO check gnupg binary too. OPENVPN_BIN = os.environ.get('OPENVPN_BIN', None) BITMASK_ROOT = os.environ.get('BITMASK_ROOT', None) |