From 1ede2fbed25df588fc0236778b7cc461a4876e00 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Wed, 31 Jan 2018 18:35:13 +0300 Subject: [PATCH] fix snapcraft build (stable) (#7763) * fix snapcraft build for stable * fix snapcraft build (stable) --- scripts/gitlab-build.sh | 3 ++- snap/gui/icon.png | Bin 0 -> 10671 bytes snap/gui/parity.desktop | 8 ++++++++ snap/snapcraft.yaml | 8 +++++++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 snap/gui/icon.png create mode 100644 snap/gui/parity.desktop diff --git a/scripts/gitlab-build.sh b/scripts/gitlab-build.sh index 876658822..9a145ad65 100755 --- a/scripts/gitlab-build.sh +++ b/scripts/gitlab-build.sh @@ -274,7 +274,8 @@ case $BUILD_PLATFORM in ARC="amd64" EXT="snap" rm -rf *snap - sed -i 's/master/'"$VER"'/g' snapcraft.yaml + sed -i 's/git/'"$VER"'/g' snapcraft.yaml + sed -i -e 's/source: ./source: ../' snapcraft.yaml snapcraft cp "parity_"$CI_BUILD_REF_NAME"_amd64.snap" "parity_"$VER"_amd64.snap" md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5" diff --git a/snap/gui/icon.png b/snap/gui/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..35238121adfd1fdb130497498b1a33f74bceff92 GIT binary patch literal 10671 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 P5_Cz|Sf^CWk^KJvUAPuQ literal 0 HcmV?d00001 diff --git a/snap/gui/parity.desktop b/snap/gui/parity.desktop new file mode 100644 index 000000000..46453b7fd --- /dev/null +++ b/snap/gui/parity.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=parity +Comment=Fast, light, robust Ethereum implementation +Exec=parity +Icon=${SNAP}/meta/gui/icon.png +Terminal=true diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2dfa984c1..7be9c0bf7 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -13,10 +13,16 @@ confinement: strict apps: parity: command: parity - plugs: [network, network-bind] + plugs: [network, network-bind, mount-observe, x11, unity7] parts: parity: source: . plugin: rust + build-attributes: [no-system-libraries] build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config] + stage-packages: [libc6, libssl1.0.0, libudev1, libstdc++6] + df: + plugin: nil + stage-packages: [coreutils] + stage: [bin/df]