trivial: snap: fix TLS communications in classic snap

This commit is contained in:
Mario Limonciello 2018-09-10 20:54:27 -05:00
parent 9ac08995d8
commit b41b2d7061
3 changed files with 15 additions and 3 deletions

View File

@ -5,6 +5,17 @@ mkdir -p $XDG_CACHE_HOME
export GIO_MODULE_DIR=$XDG_CACHE_HOME/gio-modules
export XDG_DATA_DIRS="$SNAP/usr/share"
#determine architecture
if [ "$SNAP_ARCH" = "amd64" ]; then
ARCH="x86_64-linux-gnu"
elif [ "$SNAP_ARCH" = "armhf" ]; then
ARCH="arm-linux-gnueabihf"
elif [ "$SNAP_ARCH" = "arm64" ]; then
ARCH="aarch64-linux-gnu"
else
ARCH="$SNAP_ARCH-linux-gnu"
fi
# don't update between versions, we want to preserve previous data
[ ! -d "$SNAP_USER_DATA/etc" ] && cp -R "$SNAP/etc" "$SNAP_USER_DATA"
[ ! -d "$SNAP_USER_DATA/var" ] && cp -R "$SNAP/var" "$SNAP_USER_DATA"

View File

@ -264,7 +264,8 @@ parts:
- libgpgme11
- libjson-glib-1.0-0
- libpolkit-gobject-1-0
- gnupg
- glib-networking
- libglib2.0-bin
prime:
# we explicitly don't want /usr/bin/gpgconf
# this will cause gpgme to error finding it
@ -300,7 +301,6 @@ parts:
- -usr/share/info
- -usr/share/gir-1.0
- -usr/share/upstart
- -usr/lib/*/glib-2.0
- -usr/lib/*/pkgconfig
after: [appstream-glib-dev, gudev, gusb, gnu-efi, libefivar-fixpkgconfig, libsmbios, build-introspection, gettext]
fix-bash-completion:

View File

@ -259,6 +259,8 @@ parts:
- libgpgme11
- libjson-glib-1.0-0
- libpolkit-gobject-1-0
- glib-networking
- libglib2.0-bin
prime:
# we explicitly don't want /usr/bin/gpgconf
# this will cause gpgme to error finding it
@ -294,7 +296,6 @@ parts:
- -usr/share/info
- -usr/share/gir-1.0
- -usr/share/upstart
- -usr/lib/*/glib-2.0
- -usr/lib/*/pkgconfig
after: [appstream-glib-dev, gudev, gusb, gnu-efi, libefivar-fixpkgconfig, libsmbios, build-introspection, gettext]
fix-bash-completion: