aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-05-27 17:03:17 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2014-05-27 17:03:17 +0200
commitd25edc54927d90ee88265254bff952a5f888c310 (patch)
tree2c3fa887de95ade5e33da28e105c00753c538de7 /main/alpine-conf
parenta47cbd8f5e0078ef4332fcec7a5adc0712f4755b (diff)
downloadaports-d25edc54927d90ee88265254bff952a5f888c310.tar.bz2
aports-d25edc54927d90ee88265254bff952a5f888c310.tar.xz
main/alpine-conf: fix setup-apkrepos
Diffstat (limited to 'main/alpine-conf')
-rw-r--r--main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch27
-rw-r--r--main/alpine-conf/APKBUILD12
2 files changed, 35 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch b/main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch
new file mode 100644
index 0000000000..32175f0f6e
--- /dev/null
+++ b/main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch
@@ -0,0 +1,27 @@
+From 36bd76145a20479c867c7868e5c20396b2b9e30a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 27 May 2014 16:58:42 +0200
+Subject: [PATCH] setup-apkrepos: force install virtual package
+
+it is tmpfs and we know it will be removed on reboot. Infact, we want
+it to be removed on reboot.
+---
+ setup-apkrepos.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup-apkrepos.in b/setup-apkrepos.in
+index ad9c309..e84b928 100644
+--- a/setup-apkrepos.in
++++ b/setup-apkrepos.in
+@@ -161,7 +161,7 @@ done
+ # install alpine-mirrors if its not already there
+ to_uninstall=
+ if ! apk info --quiet --installed alpine-mirrors; then
+- apk add --quiet --virtual .setup-apkrepos alpine-mirrors
++ apk add --force --quiet --virtual .setup-apkrepos alpine-mirrors
+ to_uninstall=.setup-apkrepos
+ fi
+
+--
+1.9.3
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 8a824e4a68..fc6aa497e6 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
@@ -9,6 +9,7 @@ license="GPL2"
depends="openrc"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
+ 0001-setup-apkrepos-force-install-virtual-package.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -36,8 +37,11 @@ package() {
}
md5sums="905831b30cee21cbad64c2d6a0973516 alpine-conf-3.0.1.tar.xz
-df0d66fd6dcd63f1648b0768ed23df34 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch"
+df0d66fd6dcd63f1648b0768ed23df34 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
+109d4c00c3fa6f34ec9948a8a517787e 0001-setup-apkrepos-force-install-virtual-package.patch"
sha256sums="928e37a835af314c313b85f166d51b1e2421e36191e987d0eb63aa4aa5a1b640 alpine-conf-3.0.1.tar.xz
-56988a30777e6a7ed0391236aa94d3812ab4b9ee89a7866ce62ab4eb620145f2 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch"
+56988a30777e6a7ed0391236aa94d3812ab4b9ee89a7866ce62ab4eb620145f2 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
+49c1914648feb972c7a9df71641c61e23851618ae6581de51d0223b04e133854 0001-setup-apkrepos-force-install-virtual-package.patch"
sha512sums="3ff48fe21dafa96cc43a71bbb227961c27f75e04a36dff7c0e2b8f5a6541e63156f692bd50e67f16f2c833b88a671327525f8d1f040dd1fd2982d341589bf309 alpine-conf-3.0.1.tar.xz
-6188cfe76b6acd63c9c9906f590c025ea4d0d8b49c97c0c21dee93670fafda595668534b7fcbbe5095eae967d13fb742823fe1c69412f52341c18e3f5ea7901e 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch"
+6188cfe76b6acd63c9c9906f590c025ea4d0d8b49c97c0c21dee93670fafda595668534b7fcbbe5095eae967d13fb742823fe1c69412f52341c18e3f5ea7901e 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
+f34a5e3cd82abc692e3ed793aead0f985b010bb5c44e16c7de9c130510d081536aab01f27d42ddd62053bdc53f06f6013f7951a97f6c1109e508774eb24ace6f 0001-setup-apkrepos-force-install-virtual-package.patch"