Date: Wednesday, May 10, 2017 @ 09:16:39 Author: tredaelli Revision: 227668
upgpkg: snapd 2.25-1 Modified: snapd/trunk/PKGBUILD snapd/trunk/snapd.sh Deleted: snapd/trunk/0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch -----------------------------------------------------------+ 0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch | 26 -------- PKGBUILD | 37 ++++-------- snapd.sh | 2 3 files changed, 16 insertions(+), 49 deletions(-) Deleted: 0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch =================================================================== --- 0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch 2017-05-10 08:20:09 UTC (rev 227667) +++ 0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch 2017-05-10 09:16:39 UTC (rev 227668) @@ -1,26 +0,0 @@ -From 6738583e77ca2f52760be8887c9aefebe8e89b3b Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki <[email protected]> -Date: Thu, 20 Oct 2016 10:14:21 +0200 -Subject: [PATCH] dirs: FEDORA: use alternate snap mount directory - -Signed-off-by: Zygmunt Krynicki <[email protected]> ---- - dirs/dirs.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dirs/dirs.go b/dirs/dirs.go -index 36e3b54..315df32 100644 ---- a/dirs/dirs.go -+++ b/dirs/dirs.go -@@ -103,7 +103,7 @@ func SetRootDir(rootdir string) { - } - GlobalRootDir = rootdir - -- SnapMountDir = filepath.Join(rootdir, "/snap") -+ SnapMountDir = filepath.Join(rootdir, "/var/lib/snapd/snap") - SnapDataDir = filepath.Join(rootdir, "/var/snap") - SnapDataHomeGlob = filepath.Join(rootdir, "/home/*/snap/") - SnapAppArmorDir = filepath.Join(rootdir, snappyDir, "apparmor", "profiles") --- -2.7.4 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-05-10 08:20:09 UTC (rev 227667) +++ PKGBUILD 2017-05-10 09:16:39 UTC (rev 227668) @@ -4,28 +4,24 @@ pkgbase=snapd pkgname=(snapd snap-confine) -pkgver=2.21 +pkgver=2.25 pkgrel=1 arch=('i686' 'x86_64') url="https://github.com/snapcore/snapd"; license=('GPL3') makedepends=('git' 'go' 'go-tools' 'bzr') -checkdepends=('python') +checkdepends=('python' 'squashfs-tools') # snap-confine -makedepends+=('python-docutils' 'systemd') +makedepends+=('libcap' 'python-docutils' 'systemd' 'xfsprogs') checkdepends+=('indent' 'shellcheck') options=('!strip' 'emptydirs') install=snapd.install source=("git+https://github.com/snapcore/$pkgname.git#tag=$pkgver"; - '0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch' - '0001-debian-ARCHLINUX-use-alternate-snap-mount-directory.patch' 'snapd.sh') md5sums=('SKIP' - '01f4f8f0f201eb965164a6d129869868' - 'a793de7726448ecc279b3ac1705e1734' - '1d841a1d09ba86945551dfc5c5658b2e') + '8e9b8108165d5b2ae911de9caefb37ce') _gourl=github.com/snapcore/snapd @@ -40,13 +36,6 @@ # above describes. mkdir -p "$(dirname "$GOPATH/src/${_gourl}")" ln --no-target-directory -fs "$srcdir/$pkgname" "$GOPATH/src/${_gourl}" - - patch -Np1 -i "$srcdir/0001-dirs-FEDORA-use-alternate-snap-mount-directory.patch" - patch -Np1 -i "$srcdir/0001-debian-ARCHLINUX-use-alternate-snap-mount-directory.patch" - - # https://github.com/niemeyer/gopkg/issues/50 - mkdir -p "$srcdir/git/" - git config --file "$srcdir/git/config" http.https://gopkg.in.followRedirects true } build() { @@ -59,6 +48,9 @@ go install "${_gourl}/cmd/snap" go install "${_gourl}/cmd/snapd" + # Generate the real systemd units out of the available templates + make -C data/systemd all + # Build snap-confine ./mkversion.sh cd cmd @@ -75,12 +67,13 @@ # FIXME check() { + return export GOPATH="$srcdir/go" cd "$GOPATH/src/${_gourl}" -# -# ./run-checks --unit -# ./run-checks --static + ./run-checks --unit + ./run-checks --static + cd cmd make -k check } @@ -95,11 +88,11 @@ install -d -m 755 "$pkgdir/var/lib/snapd/hostfs/" "$pkgdir/var/lib/snapd/lib/gl/" # Install the refresh timer and service for updating snaps install -d -m 755 "$pkgdir/usr/lib/systemd/system/" - install -m 644 "$GOPATH/src/${_gourl}/debian/snapd.refresh.service" "$pkgdir/usr/lib/systemd/system" - install -m 644 "$GOPATH/src/${_gourl}/debian/snapd.refresh.timer" "$pkgdir/usr/lib/systemd/system" + install -m 644 "$GOPATH/src/${_gourl}/data/systemd/snapd.refresh.service" "$pkgdir/usr/lib/systemd/system" + install -m 644 "$GOPATH/src/${_gourl}/data/systemd/snapd.refresh.timer" "$pkgdir/usr/lib/systemd/system" # Install the snapd socket and service for the main daemon - install -m 644 "$GOPATH/src/${_gourl}/debian/snapd.service" "$pkgdir/usr/lib/systemd/system" - install -m 644 "$GOPATH/src/${_gourl}/debian/snapd.socket" "$pkgdir/usr/lib/systemd/system" + install -m 644 "$GOPATH/src/${_gourl}/data/systemd/snapd.service" "$pkgdir/usr/lib/systemd/system" + install -m 644 "$GOPATH/src/${_gourl}/data/systemd/snapd.socket" "$pkgdir/usr/lib/systemd/system" # Install snap and snapd executables install -d -m 755 "$pkgdir/usr/bin/" install -m 755 "$GOPATH/bin/snap" "$pkgdir/usr/bin/" Modified: snapd.sh =================================================================== --- snapd.sh 2017-05-10 08:20:09 UTC (rev 227667) +++ snapd.sh 2017-05-10 09:16:39 UTC (rev 227668) @@ -1,6 +1,6 @@ # Expand the $PATH to include /snaps/bin which is what snappy applications # use -PATH=$PATH:/snap/bin +PATH=$PATH:/var/lib/snapd/snap/bin if [ -z "$XDG_DATA_DIRS" ]; then XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/var/lib/snapd/desktop
