summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-27 23:44:25 +0100
committerKali Kaneko <kali@leap.se>2018-03-02 03:54:15 +0100
commit7ee1dbc6468f5c6bbd4f3d795f221774e1d7ada3 (patch)
tree8ff8e61e7482d73e90d7e44153f586dca4437c63
parent031a2044a77153b6c2a3e111de17827c8395ea1e (diff)
[pkg] add deps to Makefile
-rw-r--r--pkg/riseupvpn/Makefile13
-rw-r--r--pkg/riseupvpn/TODO5
2 files changed, 10 insertions, 8 deletions
diff --git a/pkg/riseupvpn/Makefile b/pkg/riseupvpn/Makefile
index ab2b7793..58079cc6 100644
--- a/pkg/riseupvpn/Makefile
+++ b/pkg/riseupvpn/Makefile
@@ -1,11 +1,18 @@
-build: installers
+# Build a snap package for RiseupVPN.
+# (c) LEAP Encryption Access Project, 2018
+# We have to use classic confinement because it does not seem to be another way, at the moment,
+# to use policykit.
+
+build: helpers
# for speeding up build, see https://tribaal.io/making-lxd-fly-on-ubuntu-as-well.html
sudo snapcraft cleanbuild
+helpers:
+ ./pack_installers
install:
sudo snap install riseup-vpn_*.snap --dangerous --classic
uninstall:
sudo snap remove riseup-vpn
+deps:
+ sudo apt install snapcraft lxd
init-lxd:
sudo lxd init
-installers:
- ./pack_installers
diff --git a/pkg/riseupvpn/TODO b/pkg/riseupvpn/TODO
deleted file mode 100644
index ac310d66..00000000
--- a/pkg/riseupvpn/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-[ ] install polkit helpers
-[ ] install bitmask root in its place (can classic confinement install something in the global path? does this produce conflicts with proper debs?)
-[x] add icon
-[x] add a desktop file entry
-[x] copy libzmq.so.5 library to the binary path (HACK, ask in forums).