Date: Sunday, November 19, 2017 @ 19:43:34
Author: bpiotrowski
Revision: 267494
archrelease: copy trunk to community-x86_64
Added:
snapd/repos/community-x86_64/PKGBUILD
(from rev 267493, snapd/trunk/PKGBUILD)
snapd/repos/community-x86_64/snapd.install
(from rev 267493, snapd/trunk/snapd.install)
snapd/repos/community-x86_64/snapd.sh
(from rev 267493, snapd/trunk/snapd.sh)
Deleted:
snapd/repos/community-x86_64/PKGBUILD
snapd/repos/community-x86_64/snapd.install
snapd/repos/community-x86_64/snapd.sh
---------------+
PKGBUILD | 220 ++++++++++++++++++++++++++++----------------------------
snapd.install | 30 +++----
snapd.sh | 20 ++---
3 files changed, 135 insertions(+), 135 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-19 19:43:28 UTC (rev 267493)
+++ PKGBUILD 2017-11-19 19:43:34 UTC (rev 267494)
@@ -1,110 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com>
-# Contributor: Zygmunt Krynicki <me at zygoon dot pl>
-
-pkgbase=snapd
-pkgname=(snapd snap-confine)
-pkgver=2.26.1
-pkgrel=2
-_gitcommit=3853be982c99267133d132901df7da0bf850d949
-arch=('i686' 'x86_64')
-url="https://github.com/snapcore/snapd";
-license=('GPL3')
-makedepends=('git' 'go' 'go-tools' 'bzr')
-checkdepends=('python' 'squashfs-tools')
-
-# snap-confine
-makedepends+=('libcap' 'python-docutils' 'systemd' 'xfsprogs')
-checkdepends+=('indent' 'shellcheck')
-
-options=('!strip' 'emptydirs')
-install=snapd.install
-source=("git+https://github.com/snapcore/$pkgname.git#commit=$_gitcommit";
- 'snapd.sh')
-md5sums=('SKIP'
- '8e9b8108165d5b2ae911de9caefb37ce')
-
-_gourl=github.com/snapcore/snapd
-
-prepare() {
- cd "$pkgname"
-
- # Use $srcdir/go as our GOPATH
- export GOPATH="$srcdir/go"
- mkdir -p "$GOPATH"
- # Have snapd checkout appear in a place suitable for subsequent GOPATH This
- # way we don't have to go get it again and it is exactly what the tag/hash
- # above describes.
- mkdir -p "$(dirname "$GOPATH/src/${_gourl}")"
- ln --no-target-directory -fs "$srcdir/$pkgname" "$GOPATH/src/${_gourl}"
-}
-
-build() {
- export GOPATH="$srcdir/go"
- # Use get-deps.sh provided by upstream to fetch go dependencies using the
- # godeps tool and dependencies.tsv (maintained upstream).
- cd "$GOPATH/src/${_gourl}"
- XDG_CONFIG_HOME="$srcdir" ./get-deps.sh
- # Build/install snap and snapd
- 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
- autoreconf -i -f
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/snapd \
- --with-snap-mount-dir=/var/lib/snapd/snap \
- --disable-apparmor \
- --enable-nvidia-arch \
- --enable-merged-usr
- make
-}
-
-# FIXME
-check() {
- return
- export GOPATH="$srcdir/go"
- cd "$GOPATH/src/${_gourl}"
-
- ./run-checks --unit
- ./run-checks --static
-
- cd cmd
- make -k check
-}
-
-package_snapd() {
- pkgdesc="Service and tools for management of snap packages."
- depends=('snap-confine' 'squashfs-tools')
-
- export GOPATH="$srcdir/go"
- # Ensure that we have /var/lib/snapd/{hostfs,lib/gl}/ as they are required
by snap-confine
- # for constructing some bind mounts around.
- 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}/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}/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/"
- install -d -m 755 "$pkgdir/usr/lib/snapd"
- install -m 755 "$GOPATH/bin/snapd" "$pkgdir/usr/lib/snapd/"
- # Install script to export binaries paths of snaps
- install -Dm 755 "$srcdir/snapd.sh" "$pkgdir/etc/profile.d/apps-bin-path.sh"
-}
-
-package_snap-confine() {
- pkgdesc="Confinement system for snap applications"
- depends=('libseccomp' 'libsystemd')
- make -C "$srcdir/$pkgbase/cmd" install DESTDIR="$pkgdir/"
-}
Copied: snapd/repos/community-x86_64/PKGBUILD (from rev 267493,
snapd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-11-19 19:43:34 UTC (rev 267494)
@@ -0,0 +1,110 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com>
+# Contributor: Zygmunt Krynicki <me at zygoon dot pl>
+
+pkgbase=snapd
+pkgname=(snapd snap-confine)
+pkgver=2.26.1
+pkgrel=3
+_gitcommit=3853be982c99267133d132901df7da0bf850d949
+arch=('x86_64')
+url="https://github.com/snapcore/snapd";
+license=('GPL3')
+makedepends=('git' 'go-pie' 'go-tools' 'bzr')
+checkdepends=('python' 'squashfs-tools')
+
+# snap-confine
+makedepends+=('libcap' 'python-docutils' 'systemd' 'xfsprogs')
+checkdepends+=('indent' 'shellcheck')
+
+options=('!strip' 'emptydirs')
+install=snapd.install
+source=("git+https://github.com/snapcore/$pkgname.git#commit=$_gitcommit";
+ 'snapd.sh')
+md5sums=('SKIP'
+ '8e9b8108165d5b2ae911de9caefb37ce')
+
+_gourl=github.com/snapcore/snapd
+
+prepare() {
+ cd "$pkgname"
+
+ # Use $srcdir/go as our GOPATH
+ export GOPATH="$srcdir/go"
+ mkdir -p "$GOPATH"
+ # Have snapd checkout appear in a place suitable for subsequent GOPATH This
+ # way we don't have to go get it again and it is exactly what the tag/hash
+ # above describes.
+ mkdir -p "$(dirname "$GOPATH/src/${_gourl}")"
+ ln --no-target-directory -fs "$srcdir/$pkgname" "$GOPATH/src/${_gourl}"
+}
+
+build() {
+ export GOPATH="$srcdir/go"
+ # Use get-deps.sh provided by upstream to fetch go dependencies using the
+ # godeps tool and dependencies.tsv (maintained upstream).
+ cd "$GOPATH/src/${_gourl}"
+ XDG_CONFIG_HOME="$srcdir" ./get-deps.sh
+ # Build/install snap and snapd
+ 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
+ autoreconf -i -f
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/snapd \
+ --with-snap-mount-dir=/var/lib/snapd/snap \
+ --disable-apparmor \
+ --enable-nvidia-arch \
+ --enable-merged-usr
+ make
+}
+
+# FIXME
+check() {
+ return
+ export GOPATH="$srcdir/go"
+ cd "$GOPATH/src/${_gourl}"
+
+ ./run-checks --unit
+ ./run-checks --static
+
+ cd cmd
+ make -k check
+}
+
+package_snapd() {
+ pkgdesc="Service and tools for management of snap packages."
+ depends=('snap-confine' 'squashfs-tools')
+
+ export GOPATH="$srcdir/go"
+ # Ensure that we have /var/lib/snapd/{hostfs,lib/gl}/ as they are required
by snap-confine
+ # for constructing some bind mounts around.
+ 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}/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}/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/"
+ install -d -m 755 "$pkgdir/usr/lib/snapd"
+ install -m 755 "$GOPATH/bin/snapd" "$pkgdir/usr/lib/snapd/"
+ # Install script to export binaries paths of snaps
+ install -Dm 755 "$srcdir/snapd.sh" "$pkgdir/etc/profile.d/apps-bin-path.sh"
+}
+
+package_snap-confine() {
+ pkgdesc="Confinement system for snap applications"
+ depends=('libseccomp' 'libsystemd')
+ make -C "$srcdir/$pkgbase/cmd" install DESTDIR="$pkgdir/"
+}
Deleted: snapd.install
===================================================================
--- snapd.install 2017-11-19 19:43:28 UTC (rev 267493)
+++ snapd.install 2017-11-19 19:43:34 UTC (rev 267494)
@@ -1,15 +0,0 @@
-## arg 1: the new package version
-post_install() {
- echo
- echo 'To use snapd start/enable the snapd.socket'
- echo
- echo 'If you want your apps to be automatically updated'
- echo 'from the store start/enable the snapd.refresh.timer'
- echo
- echo 'NOTE: Desktop entries show up after logging in again'
- echo ' or rebooting after snapd installation'
- echo
- echo 'For more informations, see https://wiki.archlinux.org/index.php/Snapd'
-}
-
-# vim:set ts=2 sw=2 et:
Copied: snapd/repos/community-x86_64/snapd.install (from rev 267493,
snapd/trunk/snapd.install)
===================================================================
--- snapd.install (rev 0)
+++ snapd.install 2017-11-19 19:43:34 UTC (rev 267494)
@@ -0,0 +1,15 @@
+## arg 1: the new package version
+post_install() {
+ echo
+ echo 'To use snapd start/enable the snapd.socket'
+ echo
+ echo 'If you want your apps to be automatically updated'
+ echo 'from the store start/enable the snapd.refresh.timer'
+ echo
+ echo 'NOTE: Desktop entries show up after logging in again'
+ echo ' or rebooting after snapd installation'
+ echo
+ echo 'For more informations, see https://wiki.archlinux.org/index.php/Snapd'
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: snapd.sh
===================================================================
--- snapd.sh 2017-11-19 19:43:28 UTC (rev 267493)
+++ snapd.sh 2017-11-19 19:43:34 UTC (rev 267494)
@@ -1,10 +0,0 @@
-# Expand the $PATH to include /snaps/bin which is what snappy applications
-# use
-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
-else
- XDG_DATA_DIRS="$XDG_DATA_DIRS":/var/lib/snapd/desktop
-fi
-export XDG_DATA_DIRS
Copied: snapd/repos/community-x86_64/snapd.sh (from rev 267493,
snapd/trunk/snapd.sh)
===================================================================
--- snapd.sh (rev 0)
+++ snapd.sh 2017-11-19 19:43:34 UTC (rev 267494)
@@ -0,0 +1,10 @@
+# Expand the $PATH to include /snaps/bin which is what snappy applications
+# use
+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
+else
+ XDG_DATA_DIRS="$XDG_DATA_DIRS":/var/lib/snapd/desktop
+fi
+export XDG_DATA_DIRS
