diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2016-07-24 16:20:11 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-07-25 15:01:29 +0000 |
| commit | 95fc6607a42e0e5d219afb2f28b9d4d3a21f176d (patch) | |
| tree | 40ae1f894445a387d61808be6eea6e771a195211 /main/lxc | |
| parent | c63472775b114141f955a5690d3a8df7b1afa223 (diff) | |
| download | aports-95fc6607a42e0e5d219afb2f28b9d4d3a21f176d.tar.bz2 aports-95fc6607a42e0e5d219afb2f28b9d4d3a21f176d.tar.xz | |
main/lxc: workaround for openrc cgroup issue and remove useless config
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/APKBUILD | 22 | ||||
| -rw-r--r-- | main/lxc/lxc.conf | 3 |
2 files changed, 20 insertions, 5 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index a40cc31365..bc617593e1 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxc pkgver=2.0.3 _pkgver=${pkgver/_rc/.rc} -pkgrel=1 +pkgrel=2 pkgdesc="Userspace interface for the Linux kernel containment features" url="https://linuxcontainers.org/lxc/" arch="all" @@ -20,6 +20,7 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz version.patch download-template-tmpfs.patch lxc.initd + lxc.conf " builddir="$srcdir/lxc-lxc-$_pkgver" @@ -47,9 +48,17 @@ build() { package() { cd "$builddir" + make DESTDIR="$pkgdir" install || return 1 + + install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc || return 1 install -d "$pkgdir"/var/lib/lxc - install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc + + # XXX: workaround for https://github.com/lxc/lxc/issues/1095. + install -Dm644 "$srcdir"/lxc.conf "$pkgdir"/etc/lxc/lxc.conf || return 1 + + # Remove useless config for SysVinit. + rm -r "$pkgdir"/etc/default } lvm() { @@ -92,12 +101,15 @@ dev() { md5sums="839887923e097df640a40fe6ee842251 lxc-2.0.3.tar.gz 79e90616b5049a472ccdcb5b1dcdd8b1 version.patch e8fd932f3ec6d52d7b4c183fc58c0b24 download-template-tmpfs.patch -8ffde5bd9bfec77d14a8013c780074ca lxc.initd" +8ffde5bd9bfec77d14a8013c780074ca lxc.initd +032d70c80d3380353223776a5bfe4014 lxc.conf" sha256sums="635afa330088fea57883018da326fc72f85460b5a6c7802ad68044381aff14f3 lxc-2.0.3.tar.gz b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch 8cb638f927d51f05884439e6db15092e902a9c59ef830cbdcb07d88f5cff11e1 download-template-tmpfs.patch -dc39d869a2a690f7dcc9186c2707ed6c7ae2cd5248a9c062f3cb0ce4de73295b lxc.initd" +dc39d869a2a690f7dcc9186c2707ed6c7ae2cd5248a9c062f3cb0ce4de73295b lxc.initd +06c02a9d21c5160a00c0a92fac222850b97c04f830307692007f264d9344c474 lxc.conf" sha512sums="df714f189ec7aa681710fbd58405b8958740102032c0130d8a0eaaae0341a9bc91a215136203c404ad79773800f620bf6f71f811b3effe559aed66efa4f34fef lxc-2.0.3.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971 download-template-tmpfs.patch -82c8cdae3cf39a00205bb38a87561ba5b603c046c2438bfd897fc5ee4a2d1d5fde0431cb471f51b2e92cb76f795832ea9cb2f7494e4d67e7131aae2a6d6c29b2 lxc.initd" +82c8cdae3cf39a00205bb38a87561ba5b603c046c2438bfd897fc5ee4a2d1d5fde0431cb471f51b2e92cb76f795832ea9cb2f7494e4d67e7131aae2a6d6c29b2 lxc.initd +5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01 lxc.conf" diff --git a/main/lxc/lxc.conf b/main/lxc/lxc.conf new file mode 100644 index 0000000000..bdecb48398 --- /dev/null +++ b/main/lxc/lxc.conf @@ -0,0 +1,3 @@ +# Force lxc to use cgfs instead of new cgfsng. +# This is a workaround for https://github.com/lxc/lxc/issues/1095. +lxc.cgroup.use = @kernel |