diff options
| author | Kali Kaneko <kali@leap.se> | 2017-11-30 15:10:38 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-11-30 15:10:38 +0100 |
| commit | 56704dbe906901e4d22ef03affd7b64e4975b7ef (patch) | |
| tree | cf751faa41d593cc58cd1f6a0872b990fcf02d28 | |
| parent | cf543e1d31776960192df44becdf59b867eeed7f (diff) | |
[pkg] pick gpg from local build
| -rw-r--r-- | docs/hacking/osx.rst | 5 | ||||
| -rw-r--r-- | pkg/bundles/build.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/hacking/osx.rst b/docs/hacking/osx.rst index 45f1823e..e5bd306a 100644 --- a/docs/hacking/osx.rst +++ b/docs/hacking/osx.rst @@ -33,6 +33,11 @@ In OSX, we're using ``pywebview`` for the GUI launcher, that depends on ``pyobjc * Install the rest of dependencies as usual. +You also want to build the thirdparty binaryes (openvpn, gpg):: + + cd pkg/thirdparty/gnupg && ./build_gnupg.sh + + After installing that, you should be able to build the bundle:: make bundle_osx diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk index 8349a611..d83339e7 100644 --- a/pkg/bundles/build.mk +++ b/pkg/bundles/build.mk @@ -72,7 +72,7 @@ bundle_osx_missing: cp -r $(DIST_VERSION)/apps/helpers/openvpn/* $(OSX_RES)/ wget https://downloads.leap.se/thirdparty/osx/openvpn/openvpn -O $(OSX_RES)/openvpn.leap chmod +x $(OSX_RES)/openvpn.leap - cp ~/src/gnupg-1.4.20/g10/gpg $(OSX_RES)/gpg + cp ~/leap_thirdparty_build/gpg $(OSX_RES)/gpg chmod +x $(OSX_RES)/gpg bundle_osx_pkg: |