[arch-commits] Commit in snap-confine/repos (6 files)
Timothy Redaelli
tredaelli at archlinux.org
Fri Jul 1 13:06:43 UTC 2016
Date: Friday, July 1, 2016 @ 13:06:42
Author: tredaelli
Revision: 181670
archrelease: copy trunk to community-i686, community-x86_64
Added:
snap-confine/repos/community-i686/
snap-confine/repos/community-i686/PKGBUILD
(from rev 181669, snap-confine/trunk/PKGBUILD)
snap-confine/repos/community-i686/fix_CONFINEMENT_TESTS.patch
(from rev 181669, snap-confine/trunk/fix_CONFINEMENT_TESTS.patch)
snap-confine/repos/community-x86_64/
snap-confine/repos/community-x86_64/PKGBUILD
(from rev 181669, snap-confine/trunk/PKGBUILD)
snap-confine/repos/community-x86_64/fix_CONFINEMENT_TESTS.patch
(from rev 181669, snap-confine/trunk/fix_CONFINEMENT_TESTS.patch)
----------------------------------------------+
community-i686/PKGBUILD | 50 +++++++++++++++++++++++++
community-i686/fix_CONFINEMENT_TESTS.patch | 22 +++++++++++
community-x86_64/PKGBUILD | 50 +++++++++++++++++++++++++
community-x86_64/fix_CONFINEMENT_TESTS.patch | 22 +++++++++++
4 files changed, 144 insertions(+)
Copied: snap-confine/repos/community-i686/PKGBUILD (from rev 181669, snap-confine/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-07-01 13:06:42 UTC (rev 181670)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Zygmunt Krynicki <me at zygoon dot pl>
+
+pkgname=snap-confine
+pkgver=1.0.34
+pkgrel=1
+pkgdesc="Confinement system for snap applications"
+arch=('i686' 'x86_64')
+url="git://github.com/snapcore/snap-confine"
+license=('GPL3')
+depends=('bash' 'libseccomp' 'libsystemd')
+makedepends=('python-docutils' 'systemd')
+checkdepends=('indent' 'shellcheck')
+source=("https://github.com/snapcore/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+ fix_CONFINEMENT_TESTS.patch)
+md5sums=('28e2264289fcc7e8a63d74940c0f057f'
+ '99b461650909139c33e5a24d4b51470b')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/fix_CONFINEMENT_TESTS.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ autoreconf -i
+ # Confinement is disabled because arch doesn't yet have all the supporting
+ # kernel patches. Rootfs is core snap is enabled because that is the
+ # preferred way to create runtime environment for snaps. Nvidia support is
+ # enabled to support proprietary nvidia drivers.
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/snap-confine \
+ --disable-apparmor \
+ --enable-rootfs-is-core-snap \
+ --enable-nvidia-arch
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ make -k check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+}
Copied: snap-confine/repos/community-i686/fix_CONFINEMENT_TESTS.patch (from rev 181669, snap-confine/trunk/fix_CONFINEMENT_TESTS.patch)
===================================================================
--- community-i686/fix_CONFINEMENT_TESTS.patch (rev 0)
+++ community-i686/fix_CONFINEMENT_TESTS.patch 2016-07-01 13:06:42 UTC (rev 181670)
@@ -0,0 +1,22 @@
+From 09510d4cb594e3741ca056ea66144dba0d7a5147 Mon Sep 17 00:00:00 2001
+From: Timothy Redaelli <timothy.redaelli at gmail.com>
+Date: Fri, 1 Jul 2016 14:46:22 +0200
+Subject: [PATCH] Fix check for CONFINEMENT_TESTS
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fecd20c..c7572fc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,7 @@ AM_CONDITIONAL([SECCOMP], [test "x$enable_seccomp" = "xyes"])
+
+ # Enable older tests only when confinement is enabled and we're building for PC
+ # The tests are of smaller value as we port more and more tests to spread.
+-AM_CONDITIONAL([CONFINEMENT_TESTS], [test "x$enable_apparmor" = "xyes" && test "x$enable_seccomp" = "xyes" && (test "x$host_cpu" = "xx86_64" && test "x$build_cpu" = "xx86_64") || (test "x$host_cpu" = "xi686" && test "x$build_cpu" = "xi686")])
++AM_CONDITIONAL([CONFINEMENT_TESTS], [test "x$enable_apparmor" = "xyes" && test "x$enable_seccomp" = "xyes" && ((test "x$host_cpu" = "xx86_64" && test "x$build_cpu" = "xx86_64") || (test "x$host_cpu" = "xi686" && test "x$build_cpu" = "xi686"))])
+
+ # Check if seccomp userspace library is available
+ AS_IF([test "x$enable_seccomp" = "xyes"], [
Copied: snap-confine/repos/community-x86_64/PKGBUILD (from rev 181669, snap-confine/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-07-01 13:06:42 UTC (rev 181670)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Zygmunt Krynicki <me at zygoon dot pl>
+
+pkgname=snap-confine
+pkgver=1.0.34
+pkgrel=1
+pkgdesc="Confinement system for snap applications"
+arch=('i686' 'x86_64')
+url="git://github.com/snapcore/snap-confine"
+license=('GPL3')
+depends=('bash' 'libseccomp' 'libsystemd')
+makedepends=('python-docutils' 'systemd')
+checkdepends=('indent' 'shellcheck')
+source=("https://github.com/snapcore/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+ fix_CONFINEMENT_TESTS.patch)
+md5sums=('28e2264289fcc7e8a63d74940c0f057f'
+ '99b461650909139c33e5a24d4b51470b')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/fix_CONFINEMENT_TESTS.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ autoreconf -i
+ # Confinement is disabled because arch doesn't yet have all the supporting
+ # kernel patches. Rootfs is core snap is enabled because that is the
+ # preferred way to create runtime environment for snaps. Nvidia support is
+ # enabled to support proprietary nvidia drivers.
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/snap-confine \
+ --disable-apparmor \
+ --enable-rootfs-is-core-snap \
+ --enable-nvidia-arch
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ make -k check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+}
Copied: snap-confine/repos/community-x86_64/fix_CONFINEMENT_TESTS.patch (from rev 181669, snap-confine/trunk/fix_CONFINEMENT_TESTS.patch)
===================================================================
--- community-x86_64/fix_CONFINEMENT_TESTS.patch (rev 0)
+++ community-x86_64/fix_CONFINEMENT_TESTS.patch 2016-07-01 13:06:42 UTC (rev 181670)
@@ -0,0 +1,22 @@
+From 09510d4cb594e3741ca056ea66144dba0d7a5147 Mon Sep 17 00:00:00 2001
+From: Timothy Redaelli <timothy.redaelli at gmail.com>
+Date: Fri, 1 Jul 2016 14:46:22 +0200
+Subject: [PATCH] Fix check for CONFINEMENT_TESTS
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fecd20c..c7572fc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,7 @@ AM_CONDITIONAL([SECCOMP], [test "x$enable_seccomp" = "xyes"])
+
+ # Enable older tests only when confinement is enabled and we're building for PC
+ # The tests are of smaller value as we port more and more tests to spread.
+-AM_CONDITIONAL([CONFINEMENT_TESTS], [test "x$enable_apparmor" = "xyes" && test "x$enable_seccomp" = "xyes" && (test "x$host_cpu" = "xx86_64" && test "x$build_cpu" = "xx86_64") || (test "x$host_cpu" = "xi686" && test "x$build_cpu" = "xi686")])
++AM_CONDITIONAL([CONFINEMENT_TESTS], [test "x$enable_apparmor" = "xyes" && test "x$enable_seccomp" = "xyes" && ((test "x$host_cpu" = "xx86_64" && test "x$build_cpu" = "xx86_64") || (test "x$host_cpu" = "xi686" && test "x$build_cpu" = "xi686"))])
+
+ # Check if seccomp userspace library is available
+ AS_IF([test "x$enable_seccomp" = "xyes"], [
More information about the arch-commits
mailing list