diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2017-05-01 17:10:39 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2017-05-03 11:06:52 +0200 |
| commit | 0cc95f1df0641606f0173226e6f1b9f44112f962 (patch) | |
| tree | 45bb214c51b84a7f1e0c307571f93cb3d10f5416 /pkg | |
| parent | a295b63d59275ccef839d349d6d92a2cb8ee33b7 (diff) | |
[bug] include bitmask_helpers into the frozen binary
The bundled version of bitmask is unable to find the bitmask_helpers
binary. Let's include it as part of the frozen binary generated by
pyinstaller.
- Resolves: #8862
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/build_bundle_with_venv.sh | 2 | ||||
| -rw-r--r-- | pkg/pyinst/build.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh index 1d615ce7..450261ab 100755 --- a/pkg/build_bundle_with_venv.sh +++ b/pkg/build_bundle_with_venv.sh @@ -44,4 +44,4 @@ $VIRTUAL_ENV/bin/pip install dist/*.whl pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/ make bundle -make bundle_gpg +make bundle_apps diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk index 554009dd..760f7983 100644 --- a/pkg/pyinst/build.mk +++ b/pkg/pyinst/build.mk @@ -26,6 +26,13 @@ bundle_gpg: mkdir -p $(DIST_VERSION)/apps/mail cp /usr/bin/gpg $(DIST_VERSION)/apps/mail/ +bundle_linux_helpers: + mkdir -p $(DIST_VERSION)/apps/helpers + cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(DIST_VERSION)/apps/helpers/ + cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(DIST_VERSION)/apps/helpers/ + +bundle_apps: bundle_gpg bundle_linux_helpers + bundle_tar: cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION) |