[arch-commits] Commit in lxc/repos/community-x86_64 (8 files)
Morten Linderud
foxboron at archlinux.org
Thu May 6 20:57:38 UTC 2021
Date: Thursday, May 6, 2021 @ 20:57:37
Author: foxboron
Revision: 928538
archrelease: copy trunk to community-x86_64
Added:
lxc/repos/community-x86_64/PKGBUILD
(from rev 928537, lxc/trunk/PKGBUILD)
lxc/repos/community-x86_64/lxc-auto.service
(from rev 928537, lxc/trunk/lxc-auto.service)
lxc/repos/community-x86_64/lxc.service
(from rev 928537, lxc/trunk/lxc.service)
lxc/repos/community-x86_64/lxc.tmpfiles.d
(from rev 928537, lxc/trunk/lxc.tmpfiles.d)
Deleted:
lxc/repos/community-x86_64/PKGBUILD
lxc/repos/community-x86_64/lxc-auto.service
lxc/repos/community-x86_64/lxc.service
lxc/repos/community-x86_64/lxc.tmpfiles.d
------------------+
PKGBUILD | 160 +++++++++++++++++++++++++++--------------------------
lxc-auto.service | 28 ++++-----
lxc.service | 28 ++++-----
lxc.tmpfiles.d | 2
4 files changed, 112 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-06 20:57:25 UTC (rev 928537)
+++ PKGBUILD 2021-05-06 20:57:37 UTC (rev 928538)
@@ -1,77 +0,0 @@
-# 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
-epoch=1
-pkgver=4.0.8
-pkgrel=1
-pkgdesc="Linux Containers"
-arch=('x86_64')
-url="https://linuxcontainers.org"
-depends=('bash' 'perl' 'libseccomp' 'libcap' 'python' 'rsync' 'wget')
-makedepends=('docbook2x' 'lua' 'python-setuptools' 'apparmor')
-optdepends=('dnsmasq: lxc-net.service'
- 'lua'
- 'lua-filesystem: lxc-top'
- 'lua-alt-getopt: lxc-top')
-license=('LGPL')
-options=('emptydirs')
-backup=('etc/lxc/default.conf'
- 'etc/default/lxc')
-validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
-source=("https://linuxcontainers.org/downloads/lxc/$pkgname-${pkgver}.tar.gz"{,.asc}
- "lxc.tmpfiles.d"
- "lxc.service"
- "lxc-auto.service")
-sha256sums=('ac55852bcc7b828e82cfa4afec794dd030a030c728b7b56c0c6b671fb5af0b9b'
- 'SKIP'
- '10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479'
- 'bbe7e0447bc3bf5f75f312c34d647f5218024731628a5e8633b1ea1801ebe16b'
- 'b31f8d6b301ab9901b43f2696bcd0babb32b96e4a59fab63a2d642e43bf26bb3')
-
-prepare() {
- cd "$srcdir/$pkgname-${pkgver/_/-}"
- sed -i \
- -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"https://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' \
- configure.ac
-}
-
-build() {
- cd "$srcdir/$pkgname-${pkgver/_/-}"
- ./autogen.sh
- bashcompdir=/usr/share/bash-completion/completions ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --sysconfdir=/etc \
- --enable-apparmor \
- --enable-seccomp \
- --enable-capabilities \
- --with-init-script=systemd \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --enable-pam \
- --disable-werror \
- --with-pamdir=/usr/lib/security
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-${pkgver/_/-}"
-
- 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 at .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/{}" \;
- 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 928537, lxc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-06 20:57:37 UTC (rev 928538)
@@ -0,0 +1,83 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# 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
+epoch=1
+pkgver=4.0.9
+pkgrel=1
+pkgdesc="Linux Containers"
+arch=('x86_64')
+url="https://linuxcontainers.org"
+depends=('bash' 'perl' 'libseccomp' 'libcap' 'python' 'rsync' 'wget')
+makedepends=('docbook2x' 'lua' 'python-setuptools' 'apparmor')
+optdepends=('dnsmasq: lxc-net.service'
+ 'lua'
+ 'lua-filesystem: lxc-top'
+ 'lua-alt-getopt: lxc-top')
+license=('LGPL')
+options=('emptydirs')
+backup=('etc/lxc/default.conf'
+ 'etc/default/lxc')
+validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
+source=("https://linuxcontainers.org/downloads/lxc/$pkgname-${pkgver}.tar.gz"{,.asc}
+ "fix-70736.patch::https://github.com/lxc/lxc/commit/86c780115a6ad14673f0b6b057219020b0523014.patch"
+ "lxc.tmpfiles.d"
+ "lxc.service"
+ "lxc-auto.service")
+sha256sums=('1fcf0610e9140eceb4be2334eb537bb9c5a213faea77c793ab3c62b86f37e52b'
+ 'SKIP'
+ '05031e6e12768a0928adbf2c745f11a8d9152428e0bf3ea81eee1855f27ca540'
+ '10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479'
+ 'bbe7e0447bc3bf5f75f312c34d647f5218024731628a5e8633b1ea1801ebe16b'
+ 'b31f8d6b301ab9901b43f2696bcd0babb32b96e4a59fab63a2d642e43bf26bb3')
+
+prepare() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+ sed -i \
+ -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"https://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' \
+ configure.ac
+ # https://bugs.archlinux.org/task/70736
+ # https://github.com/lxc/lxc/pull/3827
+ patch -Np1 < "$srcdir/fix-70736.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+ ./autogen.sh
+ bashcompdir=/usr/share/bash-completion/completions ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc \
+ --enable-apparmor \
+ --enable-seccomp \
+ --enable-capabilities \
+ --with-init-script=systemd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-pam \
+ --disable-werror \
+ --with-pamdir=/usr/lib/security
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+
+ 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 at .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/{}" \;
+ 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/{}" \;
+}
Deleted: lxc-auto.service
===================================================================
--- lxc-auto.service 2021-05-06 20:57:25 UTC (rev 928537)
+++ lxc-auto.service 2021-05-06 20:57:37 UTC (rev 928538)
@@ -1,14 +0,0 @@
-[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
-RemainAfterExit=true
-
-[Install]
-WantedBy=multi-user.target
Copied: lxc/repos/community-x86_64/lxc-auto.service (from rev 928537, lxc/trunk/lxc-auto.service)
===================================================================
--- lxc-auto.service (rev 0)
+++ lxc-auto.service 2021-05-06 20:57:37 UTC (rev 928538)
@@ -0,0 +1,14 @@
+[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
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target
Deleted: lxc.service
===================================================================
--- lxc.service 2021-05-06 20:57:25 UTC (rev 928537)
+++ lxc.service 2021-05-06 20:57:37 UTC (rev 928538)
@@ -1,14 +0,0 @@
-[Unit]
-Description=%i LXC
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/lxc-start -d -n %i -p /run/lxc-%i.pid
-PIDFile=/run/lxc-%i.pid
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=true
-TasksMax=32768
-
-[Install]
-WantedBy=multi-user.target
Copied: lxc/repos/community-x86_64/lxc.service (from rev 928537, lxc/trunk/lxc.service)
===================================================================
--- lxc.service (rev 0)
+++ lxc.service 2021-05-06 20:57:37 UTC (rev 928538)
@@ -0,0 +1,14 @@
+[Unit]
+Description=%i LXC
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lxc-start -d -n %i -p /run/lxc-%i.pid
+PIDFile=/run/lxc-%i.pid
+ExecStop=/usr/bin/lxc-stop -n %i
+Delegate=true
+TasksMax=32768
+
+[Install]
+WantedBy=multi-user.target
Deleted: lxc.tmpfiles.d
===================================================================
--- lxc.tmpfiles.d 2021-05-06 20:57:25 UTC (rev 928537)
+++ lxc.tmpfiles.d 2021-05-06 20:57:37 UTC (rev 928538)
@@ -1 +0,0 @@
-w /sys/fs/cgroup/memory/memory.use_hierarchy - - - - 1
Copied: lxc/repos/community-x86_64/lxc.tmpfiles.d (from rev 928537, lxc/trunk/lxc.tmpfiles.d)
===================================================================
--- lxc.tmpfiles.d (rev 0)
+++ lxc.tmpfiles.d 2021-05-06 20:57:37 UTC (rev 928538)
@@ -0,0 +1 @@
+w /sys/fs/cgroup/memory/memory.use_hierarchy - - - - 1
More information about the arch-commits
mailing list