From 0cc95f1df0641606f0173226e6f1b9f44112f962 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Mon, 1 May 2017 17:10:39 +0200 Subject: [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 --- pkg/build_bundle_with_venv.sh | 2 +- pkg/pyinst/build.mk | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'pkg') 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) -- cgit v1.2.3