summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD72
-rw-r--r--lxc-auto.service13
-rw-r--r--lxc.service2
4 files changed, 76 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1414bb5c33f..198bfcf0c18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,45 @@
+# Generated by mksrcinfo v8
+# Mon Jun 11 20:08:44 UTC 2018
pkgbase = lxc-git
- pkgdesc = Linux Containers from git
- pkgver = 1.1.0.377.g2d9ec00
+ pkgdesc = Linux Containers git version
+ pkgver = 3.0.0.r278.gc6d0d3cb
pkgrel = 1
epoch = 1
url = http://linuxcontainers.org
- arch = i686
arch = x86_64
+ arch = armv6h
+ arch = armv7h
+ arch = aarch64
license = LGPL
- makedepends = git
makedepends = docbook2x
makedepends = lua
+ makedepends = python-setuptools
+ makedepends = git
depends = bash
depends = perl
depends = libseccomp
depends = libcap
depends = python
- depends = cgmanager
- optdepends = arch-install-scripts: for archlinux template
+ depends = rsync
+ depends = wget
+ optdepends = dnsmasq: lxc-net.service
optdepends = lua
optdepends = lua-filesystem: lxc-top
optdepends = lua-alt-getopt: lxc-top
provides = lxc
conflicts = lxc
+ conflicts = lxc-git
options = emptydirs
backup = etc/lxc/default.conf
+ backup = etc/default/lxc
source = git://github.com/lxc/lxc
source = lxc.tmpfiles.d
source = lxc.service
- md5sums = SKIP
- md5sums = df94c9fb8a753011c86ee664e9f521ff
- md5sums = 32db4ef06b27f36e15ff4b67c049dfeb
+ source = lxc-auto.service
+ sha256sums = SKIP
+ sha256sums = 10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479
+ sha256sums = 711fb84c87b143cb0098e095fdebb040b15f553a854efbe846a00100bdb9ae88
+ sha256sums = 4174fcc0a664108f1884920930a3dbec0aeceed1fc24f00c200a583c06d447d0
pkgname = lxc-git
diff --git a/PKGBUILD b/PKGBUILD
index b627f1bd7d5..a06dbc95714 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
-# Maintainer: Naoki Kawakami <nkawakami atto parallels dotto com>
-# Contributor: tuxce.net <tuxce.net@gmail.com>
+# Maintainer: graysky <graysky AT archlinux DOT us>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
# Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -7,69 +6,82 @@
# Contributor: Jon Nordby <jononor@gmail.com>
pkgname=lxc-git
-pkgver=1.1.0.377.g2d9ec00
-epoch=1
_pkgname=lxc
-_gitname=${_pkgname}
+pkgver=3.0.0.r278.gc6d0d3cb
pkgrel=1
-pkgdesc="Linux Containers from git"
-arch=('i686' 'x86_64')
+epoch=1
+pkgdesc="Linux Containers git version"
+arch=('x86_64' 'armv6h' 'armv7h' 'aarch64')
url="http://linuxcontainers.org"
-depends=('bash' 'perl' 'libseccomp' 'libcap' 'python' 'cgmanager')
-makedepends=('git' 'docbook2x' 'lua')
-optdepends=('arch-install-scripts: for archlinux template'
+depends=('bash' 'perl' 'libseccomp' 'libcap' 'python' 'rsync' 'wget')
+makedepends=('docbook2x' 'lua' 'python-setuptools' 'git')
+optdepends=('dnsmasq: lxc-net.service'
'lua'
'lua-filesystem: lxc-top'
'lua-alt-getopt: lxc-top')
license=('LGPL')
options=('emptydirs')
-backup=('etc/lxc/default.conf')
+backup=('etc/lxc/default.conf'
+ 'etc/default/lxc')
provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=($_pkgname lxc-git)
source=("git://github.com/lxc/lxc"
"lxc.tmpfiles.d"
- "lxc.service")
-md5sums=("SKIP"
- 'df94c9fb8a753011c86ee664e9f521ff'
- '32db4ef06b27f36e15ff4b67c049dfeb')
+ "lxc.service"
+ "lxc-auto.service")
+sha256sums=('SKIP'
+ '10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479'
+ '711fb84c87b143cb0098e095fdebb040b15f553a854efbe846a00100bdb9ae88'
+ '4174fcc0a664108f1884920930a3dbec0aeceed1fc24f00c200a583c06d447d0')
+
+
+pkgver() {
+ cd "$_pkgname"
+ git describe --long | sed 's/^lxc-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
prepare() {
- cd "$_gitname"
+ cd "$_pkgname"
sed -i \
-e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' \
configure.ac
-}
-
-pkgver() {
- cd "$_gitname"
-# git --no-pager describe --tags | sed 's:-:.:g'
- git --no-pager describe --tags | sed 's:^lxc-::' | sed 's:-:.:g'
+ sed -i \
+ -e 's|\${prefix}/||g' \
+ lxc.pc.in
+ sed -i \
+ -e 's|dirlen,|dirlen=0,|' \
+ src/lxc/storage/overlay.c
}
build() {
- cd "$_gitname"
+ cd "$_pkgname"
./autogen.sh
- ./configure \
+ bashcompdir=/usr/share/bash-completion/completions ./configure \
--prefix=/usr \
--sbindir=/usr/bin \
--localstatedir=/var \
--libexecdir=/usr/lib \
+ --libdir=/usr/lib \
--sysconfdir=/etc \
--disable-apparmor \
--enable-seccomp \
- --enable-cgmanager \
--enable-capabilities \
- --enable-lua
+ --with-init-script=systemd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-pam \
+ --with-pamdir=/usr/lib/security
make
}
package() {
- cd "$_gitname"
+ cd "$_pkgname"
+
make DESTDIR="$pkgdir" install
install -d -m755 "$pkgdir/var/lib/lxc"
install -d -m755 "$pkgdir/usr/lib/lxc/rootfs/dev"
- install -D -m644 ${srcdir}/lxc.service ${pkgdir}/usr/lib/systemd/system/lxc@.service
- install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf
+ install -D -m644 "$srcdir"/lxc.service "$pkgdir"/usr/lib/systemd/system/lxc@.service
+ install -D -m644 "$srcdir"/lxc-auto.service "$pkgdir"/usr/lib/systemd/system/lxc-auto.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/{}" \;
diff --git a/lxc-auto.service b/lxc-auto.service
new file mode 100644
index 00000000000..ac93e5603eb
--- /dev/null
+++ b/lxc-auto.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Autostart LXC Container
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lxc-autostart
+ExecStop=/usr/bin/lxc-autostart -s
+Delegate=true
+TasksMax=32768
+
+[Install]
+WantedBy=multi-user.target
diff --git a/lxc.service b/lxc.service
index 4c0c34e3ea1..c82307a73cd 100644
--- a/lxc.service
+++ b/lxc.service
@@ -6,6 +6,8 @@ After=network.target
Type=forking
ExecStart=/usr/bin/lxc-start -d -n %i
ExecStop=/usr/bin/lxc-stop -n %i
+Delegate=true
+TasksMax=32768
[Install]
WantedBy=multi-user.target