Commit 96245c14 authored by Philip Müller's avatar Philip Müller

[pkg-upd] 2.39.2-4

parent 73649979
......@@ -9,7 +9,7 @@ pkgdesc="Service and tools for management of snap packages."
depends=('squashfs-tools' 'libseccomp' 'libsystemd' 'apparmor')
optdepends=('bash-completion: bash completion support')
pkgver=2.39.2
pkgrel=2
pkgrel=4
arch=('x86_64' 'i686' 'armv7h' 'aarch64')
url="https://github.com/snapcore/snapd"
license=('GPL3')
......@@ -18,15 +18,15 @@ conflicts=('snap-confine')
options=('!strip' 'emptydirs')
install=snapd.install
source=("$pkgname-$pkgver.tar.xz::https://github.com/snapcore/${pkgname}/releases/download/${pkgver}/${pkgname}_${pkgver}.vendor.tar.xz"
https://patch-diff.githubusercontent.com/raw/snapcore/snapd/pull/6998.patch)
https://github.com/snapcore/snapd/commit/1ce7a410f2bf15b7d2fa34dfbaa77b3810069520.patch)
sha256sums=('a938b0175070e3c9095d344f33cd39b4e122d9b98830f5a032da2679457895e8'
'2457c614231d75beb7f45cd61137e1b7c74fda0e591a70446c1860b5a5435294')
'd5f16f45cf24d4f3a17d6e3fd8863d794203b73d7727fe3eba702ac61dd6bf95')
_gourl=github.com/snapcore/snapd
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i "$srcdir/6998.patch"
patch -Np1 -i "$srcdir/1ce7a410f2bf15b7d2fa34dfbaa77b3810069520.patch"
export GOPATH="$srcdir/go"
mkdir -p "$GOPATH"
......@@ -72,7 +72,7 @@ build() {
BINDIR=/bin \
LIBEXECDIR=/usr/lib \
SYSTEMDSYSTEMUNITDIR=/usr/lib/systemd/system \
SNAP_MOUNT_DIR=/snap \
SNAP_MOUNT_DIR=/var/lib/snapd/snap \
SNAPD_ENVIRONMENT_FILE=/etc/default/snapd
cd cmd
......@@ -80,7 +80,7 @@ build() {
./configure \
--prefix=/usr \
--libexecdir=/usr/lib/snapd \
--with-snap-mount-dir=/snap \
--with-snap-mount-dir=/var/lib/snapd/snap \
--enable-apparmor \
--enable-nvidia-biarch \
--enable-merged-usr
......@@ -163,4 +163,7 @@ package() {
rm -fv "$pkgdir/usr/lib/snapd/snapd.core-fixup.sh"
rm -fv "$pkgdir/usr/bin/ubuntu-core-launcher"
rm -fv "$pkgdir/usr/lib/snapd/system-shutdown"
# add /snap symlink
ln -s /var/lib/snapd/snap "$pkgdir/snap"
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment