[arch-commits] Commit in lxc/repos (10 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Thu Dec 26 10:01:38 UTC 2013


    Date: Thursday, December 26, 2013 @ 11:01:37
  Author: spupykin
Revision: 103083

archrelease: copy trunk to community-i686, community-x86_64

Added:
  lxc/repos/community-i686/PKGBUILD
    (from rev 103082, lxc/trunk/PKGBUILD)
  lxc/repos/community-i686/lxc.install
    (from rev 103082, lxc/trunk/lxc.install)
  lxc/repos/community-i686/lxc.tmpfiles.d
    (from rev 103082, lxc/trunk/lxc.tmpfiles.d)
  lxc/repos/community-i686/lxc at .service
    (from rev 103082, lxc/trunk/lxc at .service)
  lxc/repos/community-x86_64/PKGBUILD
    (from rev 103082, lxc/trunk/PKGBUILD)
  lxc/repos/community-x86_64/lxc.install
    (from rev 103082, lxc/trunk/lxc.install)
  lxc/repos/community-x86_64/lxc.tmpfiles.d
    (from rev 103082, lxc/trunk/lxc.tmpfiles.d)
  lxc/repos/community-x86_64/lxc at .service
    (from rev 103082, lxc/trunk/lxc at .service)
Deleted:
  lxc/repos/community-i686/PKGBUILD
  lxc/repos/community-x86_64/PKGBUILD

---------------------------------+
 /PKGBUILD                       |  120 ++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD         |   53 ----------------
 community-i686/lxc.install      |    8 ++
 community-i686/lxc.tmpfiles.d   |    1 
 community-i686/lxc at .service     |   11 +++
 community-x86_64/PKGBUILD       |   53 ----------------
 community-x86_64/lxc.install    |    8 ++
 community-x86_64/lxc.tmpfiles.d |    1 
 community-x86_64/lxc at .service   |   11 +++
 9 files changed, 160 insertions(+), 106 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-12-26 10:01:13 UTC (rev 103082)
+++ community-i686/PKGBUILD	2013-12-26 10:01:37 UTC (rev 103083)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Andrea Zucchelli <zukka77 at gmail.com>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: Jonathan Liu <net147 at gmail.com>
-# Contributor: Jon Nordby <jononor at gmail.com>
-
-pkgname=lxc
-pkgver=0.9.0
-epoch=1
-pkgrel=4
-pkgdesc="Linux Containers"
-arch=('i686' 'x86_64')
-url="http://lxc.sourceforge.net/"
-depends=('bash' 'perl' 'libseccomp')
-makedepends=('docbook2x')
-optdepends=('arch-install-scripts: for archlinux template')
-license=('LGPL')
-source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
-md5sums=('8552a4479090616f4bc04d8473765fc9')
-
-prepare() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  sed -i \
-    -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \
-    -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \
-    configure.ac
-}
-
-build() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --sysconfdir=/etc \
-    --disable-apparmor \
-    --enable-seccomp
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-
-  make DESTDIR="$pkgdir" install
-  install -d -m755 "$pkgdir/var/lib/lxc"
-
-  cd doc
-  find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \;
-  find . -type f -name '*.5' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man5/{}" \;
-  find . -type f -name '*.7' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man7/{}" \;
-}

Copied: lxc/repos/community-i686/PKGBUILD (from rev 103082, lxc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Andrea Zucchelli <zukka77 at gmail.com>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Jonathan Liu <net147 at gmail.com>
+# Contributor: Jon Nordby <jononor at gmail.com>
+
+pkgname=lxc
+pkgver=0.9.0
+epoch=1
+pkgrel=5
+pkgdesc="Linux Containers"
+arch=('i686' 'x86_64')
+url="http://linuxcontainers.org"
+depends=('bash' 'perl' 'libseccomp')
+makedepends=('docbook2x')
+optdepends=('arch-install-scripts: for archlinux template')
+license=('LGPL')
+install=lxc.install
+source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
+	"lxc.tmpfiles.d"
+	"lxc at .service")
+md5sums=('8552a4479090616f4bc04d8473765fc9'
+         'df94c9fb8a753011c86ee664e9f521ff'
+         '8003139e60ea66c05460660f31780706')
+
+prepare() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i \
+    -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \
+    -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \
+    configure.ac
+}
+
+build() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  ./autogen.sh
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --sysconfdir=/etc \
+    --disable-apparmor \
+    --enable-seccomp
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+
+  make DESTDIR="$pkgdir" install
+  install -d -m755 "$pkgdir/var/lib/lxc"
+  install -D -m644 ${srcdir}/lxc at .service ${pkgdir}/usr/lib/systemd/system/lxc at .service
+  install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf
+
+  cd doc
+  find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \;
+  find . -type f -name '*.5' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man5/{}" \;
+  find . -type f -name '*.7' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man7/{}" \;
+}

Copied: lxc/repos/community-i686/lxc.install (from rev 103082, lxc/trunk/lxc.install)
===================================================================
--- community-i686/lxc.install	                        (rev 0)
+++ community-i686/lxc.install	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1,8 @@
+post_upgrade() {
+  [[ $(vercmp "$1" 1:1) -le 0 ]] && return 0
+  cat << EOF
+* Since v1.0, lxc-shutdown(1) is gone and its functionality is provided by
+* lxc-stop(1) by default. The old lxc-stop(1) behavior can be recovered
+* with 'lxc-stop --kill'.
+EOF
+}

Copied: lxc/repos/community-i686/lxc.tmpfiles.d (from rev 103082, lxc/trunk/lxc.tmpfiles.d)
===================================================================
--- community-i686/lxc.tmpfiles.d	                        (rev 0)
+++ community-i686/lxc.tmpfiles.d	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1 @@
+w /sys/fs/cgroup/memory/memory.use_hierarchy - - - - 1

Copied: lxc/repos/community-i686/lxc at .service (from rev 103082, lxc/trunk/lxc at .service)
===================================================================
--- community-i686/lxc at .service	                        (rev 0)
+++ community-i686/lxc at .service	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1,11 @@
+[Unit]
+Description=%I LXC
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lxc-start -d -n %I
+ExecStop=/usr/bin/lxc-stop -n %I
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-12-26 10:01:13 UTC (rev 103082)
+++ community-x86_64/PKGBUILD	2013-12-26 10:01:37 UTC (rev 103083)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Andrea Zucchelli <zukka77 at gmail.com>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: Jonathan Liu <net147 at gmail.com>
-# Contributor: Jon Nordby <jononor at gmail.com>
-
-pkgname=lxc
-pkgver=0.9.0
-epoch=1
-pkgrel=4
-pkgdesc="Linux Containers"
-arch=('i686' 'x86_64')
-url="http://lxc.sourceforge.net/"
-depends=('bash' 'perl' 'libseccomp')
-makedepends=('docbook2x')
-optdepends=('arch-install-scripts: for archlinux template')
-license=('LGPL')
-source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
-md5sums=('8552a4479090616f4bc04d8473765fc9')
-
-prepare() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  sed -i \
-    -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \
-    -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \
-    configure.ac
-}
-
-build() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --sysconfdir=/etc \
-    --disable-apparmor \
-    --enable-seccomp
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
-
-  make DESTDIR="$pkgdir" install
-  install -d -m755 "$pkgdir/var/lib/lxc"
-
-  cd doc
-  find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \;
-  find . -type f -name '*.5' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man5/{}" \;
-  find . -type f -name '*.7' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man7/{}" \;
-}

Copied: lxc/repos/community-x86_64/PKGBUILD (from rev 103082, lxc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Andrea Zucchelli <zukka77 at gmail.com>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Jonathan Liu <net147 at gmail.com>
+# Contributor: Jon Nordby <jononor at gmail.com>
+
+pkgname=lxc
+pkgver=0.9.0
+epoch=1
+pkgrel=5
+pkgdesc="Linux Containers"
+arch=('i686' 'x86_64')
+url="http://linuxcontainers.org"
+depends=('bash' 'perl' 'libseccomp')
+makedepends=('docbook2x')
+optdepends=('arch-install-scripts: for archlinux template')
+license=('LGPL')
+install=lxc.install
+source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
+	"lxc.tmpfiles.d"
+	"lxc at .service")
+md5sums=('8552a4479090616f4bc04d8473765fc9'
+         'df94c9fb8a753011c86ee664e9f521ff'
+         '8003139e60ea66c05460660f31780706')
+
+prepare() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i \
+    -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \
+    -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \
+    configure.ac
+}
+
+build() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  ./autogen.sh
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --sysconfdir=/etc \
+    --disable-apparmor \
+    --enable-seccomp
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+
+  make DESTDIR="$pkgdir" install
+  install -d -m755 "$pkgdir/var/lib/lxc"
+  install -D -m644 ${srcdir}/lxc at .service ${pkgdir}/usr/lib/systemd/system/lxc at .service
+  install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf
+
+  cd doc
+  find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \;
+  find . -type f -name '*.5' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man5/{}" \;
+  find . -type f -name '*.7' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man7/{}" \;
+}

Copied: lxc/repos/community-x86_64/lxc.install (from rev 103082, lxc/trunk/lxc.install)
===================================================================
--- community-x86_64/lxc.install	                        (rev 0)
+++ community-x86_64/lxc.install	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1,8 @@
+post_upgrade() {
+  [[ $(vercmp "$1" 1:1) -le 0 ]] && return 0
+  cat << EOF
+* Since v1.0, lxc-shutdown(1) is gone and its functionality is provided by
+* lxc-stop(1) by default. The old lxc-stop(1) behavior can be recovered
+* with 'lxc-stop --kill'.
+EOF
+}

Copied: lxc/repos/community-x86_64/lxc.tmpfiles.d (from rev 103082, lxc/trunk/lxc.tmpfiles.d)
===================================================================
--- community-x86_64/lxc.tmpfiles.d	                        (rev 0)
+++ community-x86_64/lxc.tmpfiles.d	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1 @@
+w /sys/fs/cgroup/memory/memory.use_hierarchy - - - - 1

Copied: lxc/repos/community-x86_64/lxc at .service (from rev 103082, lxc/trunk/lxc at .service)
===================================================================
--- community-x86_64/lxc at .service	                        (rev 0)
+++ community-x86_64/lxc at .service	2013-12-26 10:01:37 UTC (rev 103083)
@@ -0,0 +1,11 @@
+[Unit]
+Description=%I LXC
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lxc-start -d -n %I
+ExecStop=/usr/bin/lxc-stop -n %I
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list