diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2017-09-13 08:04:58 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-09-14 06:48:12 +0000 |
| commit | f1886418247c53fb5362d000f1c8e6919569e3bc (patch) | |
| tree | dd64d73a7698375102ea5a3bda5a8601a25ceefd /main/lxc | |
| parent | e849330305414ce5bc7d344cd7e5532701496ee9 (diff) | |
| download | aports-f1886418247c53fb5362d000f1c8e6919569e3bc.tar.bz2 aports-f1886418247c53fb5362d000f1c8e6919569e3bc.tar.xz | |
main/lxc: upgrade to 2.1.0
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/APKBUILD | 42 | ||||
| -rw-r--r-- | main/lxc/download-template-tmpfs.patch | 11 |
2 files changed, 28 insertions, 25 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index e6fe028c43..7b8ac65763 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,9 +3,9 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lxc -pkgver=2.0.8 +pkgver=2.1.0 _pkgver=${pkgver/_rc/.rc} -pkgrel=1 +pkgrel=0 pkgdesc="Userspace interface for the Linux kernel containment features" url="https://linuxcontainers.org/lxc/" arch="all" @@ -13,7 +13,7 @@ license="GPL" depends="gzip" depends_dev="libcap-dev" makedepends="$depends_dev lvm2 util-linux automake autoconf libtool lua5.2-dev - linux-headers bash tar docbook2x libseccomp-dev python3-dev dnsmasq wget" + linux-headers bash tar docbook2x libseccomp-dev python3-dev dnsmasq" options="suid" subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm::noarch lua5.2-lxc:_lua52 $pkgname-download:_download:noarch $pkgname-templates::noarch $pkgname-libs @@ -24,15 +24,13 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz lxc.conf download-template-tmpfs.patch - alpine-default-repos.patch - 0001-lxc-alpine-Add-support-for-ppc64le.patch " builddir="$srcdir/lxc-lxc-$_pkgver" _tmpldir="usr/share/lxc/templates" prepare() { - default_prepare || return 1 + default_prepare ./autogen.sh } @@ -50,21 +48,25 @@ build() { --enable-python \ --with-lua-pc=lua5.2 \ --with-distro=alpine \ - --disable-werror \ - || return 1 - make VERSION=$pkgver || return 1 + --disable-werror + make VERSION=$pkgver +} + +check() { + cd "$builddir" + make check } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc || return 1 + install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc install -d "$pkgdir"/var/lib/lxc # XXX: workaround for https://github.com/lxc/lxc/issues/1095. - install -Dm644 "$srcdir"/lxc.conf "$pkgdir"/etc/lxc/lxc.conf || return 1 + install -Dm644 "$srcdir"/lxc.conf "$pkgdir"/etc/lxc/lxc.conf # Remove useless config for SysVinit. rm -r "$pkgdir"/etc/default @@ -81,8 +83,8 @@ _lua52() { pkgdesc="Lua 5.2 module for LXC" local dir; for dir in lib share; do - mkdir -p "$subpkgdir"/usr/$dir || return 1 - mv "$pkgdir"/usr/$dir/lua "$subpkgdir"/usr/$dir/ || return 1 + mkdir -p "$subpkgdir"/usr/$dir + mv "$pkgdir"/usr/$dir/lua "$subpkgdir"/usr/$dir/ done } @@ -90,7 +92,7 @@ _py3() { pkgdesc="Python3 module for LXC" depends="python3" mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/python3.* "$subpkgdir"/usr/lib || return 1 + mv "$pkgdir"/usr/lib/python3.* "$subpkgdir"/usr/lib } _download() { @@ -106,14 +108,14 @@ templates() { depends="bash tar" mkdir -p "$subpkgdir"/$_tmpldir - mv "$pkgdir"/$_tmpldir/* "$subpkgdir"/$_tmpldir/ || return 1 + mv "$pkgdir"/$_tmpldir/* "$subpkgdir"/$_tmpldir/ # Keep alpine template in the base package (doesn't need bash or GNU tar). mv "$subpkgdir"/$_tmpldir/lxc-alpine "$pkgdir"/$_tmpldir/ } dev() { - default_dev || return 1 + default_dev # fix abuild smartness mv "$subpkgdir"/usr/bin/lxc-config "$pkgdir"/usr/bin/ @@ -147,10 +149,8 @@ EOF } -sha512sums="a71a6408e23b0a03f59e6e68b9b87147fb6d0843932942f9e46da59ca58ed357203d0bca1d0e65d53ca441c4a6c36945fc51a0d4a835a866f23cf7405a6a6cd9 lxc-2.0.8.tar.gz +sha512sums="91309bb0e3db894f3bb29805d90f4617521e8dc980229d4626dfb73ce34c57803a3d04bb8a06c99c350cc69bef966f410acb5ffa14a361d7f6969f96c07214ba lxc-2.1.0.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch 1037e0b773553aa04b619cec7cfc8fa504af830e58c8211eda367da7e36aeb88f45fca1f955a08fc4fa3f9da660017d5fe7145a326a2064cf15e24d1772d9e27 lxc.initd 5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01 lxc.conf -b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971 download-template-tmpfs.patch -a8ce110414578ba58cee8c15762f59d5185d7e543e8fdd46e1e7148895600b3603499e2c2b9222ee36d867b07e8c9776d8dee994a1647bac4d1fb478129faaf9 alpine-default-repos.patch -16e6fb35827f05b0aae48264f9f32dc8e7295348a5f44719f72a70e8b18ca5070b52fa9a407b7aab9dba73e48ba5d0a6afbbc0dc4b175bf4ada699ad9946dc6f 0001-lxc-alpine-Add-support-for-ppc64le.patch" +02fd192d137cbb5b6db6959275387d05653f41dad5a5e46ae9b53cacead8cef937733927284658d3f0b910de81f9364c7f0248db990efd88806cf3029264c214 download-template-tmpfs.patch" diff --git a/main/lxc/download-template-tmpfs.patch b/main/lxc/download-template-tmpfs.patch index de36c365a0..c3525908c9 100644 --- a/main/lxc/download-template-tmpfs.patch +++ b/main/lxc/download-template-tmpfs.patch @@ -1,12 +1,15 @@ +diff --git a/templates/lxc-download.in b/templates/lxc-download.in +index 4905521..67a08a9 100644 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in -@@ -298,11 +298,15 @@ fi +@@ -310,12 +310,15 @@ fi + # Trap all exit signals trap cleanup EXIT HUP INT TERM - --if ! type mktemp >/dev/null 2>&1; then +- +-if ! command -V mktemp >/dev/null 2>&1; then - DOWNLOAD_TEMP=/tmp/lxc-download.$$ -- mkdir -p $DOWNLOAD_TEMP +- mkdir -p "${DOWNLOAD_TEMP}" -else - DOWNLOAD_TEMP=$(mktemp -d) +if ! grep -qw '/tmp' /proc/mounts; then |