aboutsummaryrefslogtreecommitdiffstats
path: root/main/lxc
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2014-04-15 09:58:14 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2014-04-15 09:58:14 +0000
commit450ffea21f019cfa559c6ee22a2315dc8c3bc8ac (patch)
tree1668bc748cefce1a61834088cca3e652635a796d /main/lxc
parent61c3be7e6e6dd03f0696c5cd5ba03d1991d5ffbc (diff)
downloadaports-450ffea21f019cfa559c6ee22a2315dc8c3bc8ac.tar.bz2
aports-450ffea21f019cfa559c6ee22a2315dc8c3bc8ac.tar.xz
main/lxc: set correct lxc_arch for x86
reported https://github.com/lxc/lxc/pull/201 refs #2843
Diffstat (limited to 'main/lxc')
-rw-r--r--main/lxc/0001-alpinelinux-set-correct-lxc_arch-for-x86.patch24
-rw-r--r--main/lxc/APKBUILD12
2 files changed, 32 insertions, 4 deletions
diff --git a/main/lxc/0001-alpinelinux-set-correct-lxc_arch-for-x86.patch b/main/lxc/0001-alpinelinux-set-correct-lxc_arch-for-x86.patch
new file mode 100644
index 0000000000..f6d80684a6
--- /dev/null
+++ b/main/lxc/0001-alpinelinux-set-correct-lxc_arch-for-x86.patch
@@ -0,0 +1,24 @@
+From 1e2eb721ed696412c7aafc9538b3e45ac5c96ef9 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Tue, 15 Apr 2014 09:51:53 +0000
+Subject: [PATCH] alpinelinux: set correct lxc_arch for x86
+
+---
+ templates/lxc-alpine.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index d8c6674..7a22d5e 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -362,6 +362,7 @@ apk_arch=$arch
+ case "$arch" in
+ i[3-6]86)
+ apk_arch=x86
++ lxc_arch=x86
+ ;;
+ x86)
+ lxc_arch=i686
+--
+1.9.2
+
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index 205e265e6f..e6eee7b85c 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -3,7 +3,7 @@
pkgname=lxc
pkgver=1.0.2
_mypkgver=${pkgver/_rc/.rc}
-pkgrel=0
+pkgrel=1
pkgdesc="linux containers - tools"
url="http://lxc.sourceforge.net/"
arch="all"
@@ -17,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm lua5.2-lxc:_lua52
source="https://github.com/lxc/lxc/archive/lxc-$_mypkgver.tar.gz
version.patch
lxc.initd
+ 0001-alpinelinux-set-correct-lxc_arch-for-x86.patch
"
_builddir="${srcdir}/lxc-lxc-${_mypkgver}"
@@ -86,10 +87,13 @@ dev() {
md5sums="ae877b4006c2e2edfa5cb1a718455588 lxc-1.0.2.tar.gz
79e90616b5049a472ccdcb5b1dcdd8b1 version.patch
-1268d4b3e6ed004a47216b8714d09bfd lxc.initd"
+1268d4b3e6ed004a47216b8714d09bfd lxc.initd
+b93cda6f092211535cf87fa841d611aa 0001-alpinelinux-set-correct-lxc_arch-for-x86.patch"
sha256sums="705d098bb7bf8f739e2b40dd216da5c58ae558827084f1464bc0e3d911a8e8a3 lxc-1.0.2.tar.gz
b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch
-bc108a722dc359a24c48837ef7012c776b1d20a533ae0e2231f75081dad4e2f5 lxc.initd"
+bc108a722dc359a24c48837ef7012c776b1d20a533ae0e2231f75081dad4e2f5 lxc.initd
+64bf7588bb0b7c4cd214eb1b89bd8426173dedec16e90b791d795a5d1234ad2b 0001-alpinelinux-set-correct-lxc_arch-for-x86.patch"
sha512sums="275052ce94c737bfe26b32d0557af90d8939e087f8003bf0ec364e016e1e377a33a6caeda7274507816f58e12aaaea7196bbee5aea25ea50e7446ecf89a7f20c lxc-1.0.2.tar.gz
e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch
-6618ceb59f1927bb82ad1a0fe0a7d4c452ced7855d8f0953556fce9154f30a4c5afbd7a2ab07fb26e6e793b07d4c8f906f8dc27c1defe0580dcf1545c80d1d60 lxc.initd"
+6618ceb59f1927bb82ad1a0fe0a7d4c452ced7855d8f0953556fce9154f30a4c5afbd7a2ab07fb26e6e793b07d4c8f906f8dc27c1defe0580dcf1545c80d1d60 lxc.initd
+65f688f98b0b6879c6616006f8a39cce7e406c19976487f8ed41fba27beeda4a13f0182960f677d919d4441d436f0cc79a2d34fa0fff86183553e4c266cc5e70 0001-alpinelinux-set-correct-lxc_arch-for-x86.patch"