From 1385aa068f1ef41f67a0cee4eff61bc126346d4e Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 17 Jan 2022 12:56:39 -0800 Subject: Make snapcraft work --- snap/snapcraft.yaml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'snap/snapcraft.yaml') diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0dcdc3a0..acdc3fd2 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -42,9 +42,14 @@ parts: plugin: python python-version: python3 python-packages: + - setuptools - psutil - - pyside2 == 5.15.2 - qrcode + - pyside2 == 5.15.2 + # Force using setup.py, prevent using setup-freeze.py or poetry + override-build: | + rm setup-freeze.py pyproject.toml poetry.lock || true + snapcraftctl build stage-packages: - libasound2 - libatk1.0-0 @@ -114,19 +119,7 @@ parts: plugin: python python-version: python3 python-packages: - - click - - flask - - flask-socketio == 5.0.1 - - psutil - - pysocks - - requests - - unidecode - - urllib3 - - eventlet - - setuptools - - pynacl - - colorama - - cepa == 1.8.3 + - poetry stage-packages: - build-essential - libssl-dev @@ -139,8 +132,8 @@ parts: after: [tor, obfs4, snowflake-client, meek-client] tor: - source: https://dist.torproject.org/tor-0.4.6.8.tar.gz - source-checksum: sha256/15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a + source: https://dist.torproject.org/tor-0.4.6.9.tar.gz + source-checksum: sha256/c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 source-type: tar plugin: autotools build-packages: @@ -176,7 +169,8 @@ parts: # Not sure why I have to do this, but it works override-build: | cd meek-client - go build -o /root/parts/meek-client/install/bin ./... + mkdir /root/parts/meek-client/install/bin + go build -o /root/parts/meek-client/install/bin/meek-client ./... source: https://git.torproject.org/pluggable-transports/meek.git source-type: git source-tag: v0.37.0 -- cgit v1.2.3-54-g00ecf