diff options
Diffstat (limited to 'main/lxc')
| -rw-r--r-- | main/lxc/0001-lxc-alpine-create-dev-shm-before-mounting.patch | 28 | ||||
| -rw-r--r-- | main/lxc/APKBUILD | 14 |
2 files changed, 5 insertions, 37 deletions
diff --git a/main/lxc/0001-lxc-alpine-create-dev-shm-before-mounting.patch b/main/lxc/0001-lxc-alpine-create-dev-shm-before-mounting.patch deleted file mode 100644 index 8fe47f28c4..0000000000 --- a/main/lxc/0001-lxc-alpine-create-dev-shm-before-mounting.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 41d325450e2dbd1c5c0f3fdf6171d9a746bd8f5a Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 24 Apr 2015 10:09:29 +0200 -Subject: [PATCH] lxc-alpine: create /dev/shm before mounting - -This is needed for lxc.autodev=1 to work. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - templates/lxc-alpine.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in -index 886a838..963c42a 100644 ---- a/templates/lxc-alpine.in -+++ b/templates/lxc-alpine.in -@@ -251,7 +251,7 @@ lxc.cgroup.devices.allow = c 254:0 rm - # mounts point - lxc.mount.auto=cgroup:mixed proc:mixed sys:mixed - lxc.mount.entry=run run tmpfs nodev,noexec,nosuid,relatime,size=1m,mode=0755 0 0 --lxc.mount.entry=shm dev/shm tmpfs nodev,nosuid,noexec,mode=1777 0 0 -+lxc.mount.entry=shm dev/shm tmpfs nodev,nosuid,noexec,mode=1777,create=dir 0 0 - - EOF - --- -2.3.5 - diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 617b898889..279f21077f 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -2,9 +2,9 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lxc -pkgver=1.1.2 +pkgver=1.1.3 _mypkgver=${pkgver/_rc/.rc} -pkgrel=3 +pkgrel=0 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -18,7 +18,6 @@ options="suid" subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm lua5.2-lxc:_lua52 $pkgname-templates $pkgname-libs" source="https://github.com/lxc/lxc/archive/lxc-$_mypkgver.tar.gz - 0001-lxc-alpine-create-dev-shm-before-mounting.patch version.patch lxc.initd " @@ -88,15 +87,12 @@ dev() { "$pkgdir"/usr/bin/ || return 1 } -md5sums="3297d67160f879ace9a99705ecc1ffb5 lxc-1.1.2.tar.gz -497578ad8dc28e73a596f94f91b9ca87 0001-lxc-alpine-create-dev-shm-before-mounting.patch +md5sums="680198729359bd5e58dc14ce617e72b1 lxc-1.1.3.tar.gz 79e90616b5049a472ccdcb5b1dcdd8b1 version.patch 1e47412382517ee2adcbca00f07377ca lxc.initd" -sha256sums="f22fcf2659ca98dfe864e632374de98c42cdf465d0c694834b6f6098a3cb8519 lxc-1.1.2.tar.gz -bedc3915dd960b3f659f95e4a20ed38bd1fbeec409c31d226ce3da4d10780561 0001-lxc-alpine-create-dev-shm-before-mounting.patch +sha256sums="b75fb8e376d3313e152f31fb7372b68f33a953a12191a39de4cded04fff94300 lxc-1.1.3.tar.gz b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch ce4c30c65832c4b79df1c3c1ef6a444247e2866ab24690f1476e7b98b722fac1 lxc.initd" -sha512sums="7c4c9b5418321eedcd37a3f5c2c99ff227de48f672cabd1722a74722077d33badb038675ec95fc3e338eaf2b06972c4ffb2e11f36347587ef71a95fad5b66daa lxc-1.1.2.tar.gz -fb0738a1c5a4935d34a38960c8ff974ab98b39c869d2db95c846a6e07afdb8a315eb399134fe6aa2dbe0c70d2007b3e7ef17aa67dd3682b14f9157da47bceede 0001-lxc-alpine-create-dev-shm-before-mounting.patch +sha512sums="cafa4fbe4fe23b8c0b98007a79f20899c4a3b98c51d797b9c16e38dfec1eee5a513b58621308fe6551707d38028d9e5bd78ade8822691ffe4a7a369b10a48dda lxc-1.1.3.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch 4ff815d354f022854535a0069033f314263623ead48220d732683d5a268f14f221cbfe1aa9515adf1c2e47de71f1b1f1dda374a1f5f15d6f7025d2de91143d9a lxc.initd" |