From 8eac7c8a02dcc04018b289c49f3c6dc7565b36b9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 29 May 2014 15:11:00 +0200 Subject: main/alpine-conf: fix setup-disk - make sure .setup-apkrepos virtual package is uninstalled - show the progressbar --- .../0001-setup-apkrepos-fix-cleanup.patch | 24 ++++++++++++++++++++ .../0001-setup-disk-fix-progressbar.patch | 26 ++++++++++++++++++++++ main/alpine-conf/APKBUILD | 17 ++++++++++---- 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch create mode 100644 main/alpine-conf/0001-setup-disk-fix-progressbar.patch diff --git a/main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch b/main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch new file mode 100644 index 000000000..647b4bb85 --- /dev/null +++ b/main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch @@ -0,0 +1,24 @@ +From ed5fb1de932a4de41bb854af5d47381096e62e02 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Thu, 29 May 2014 15:04:10 +0200 +Subject: [PATCH] setup-apkrepos: fix cleanup + +we need uninstall .setup* +--- + setup-apkrepos.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-apkrepos.in b/setup-apkrepos.in +index e84b928..7744d8b 100644 +--- a/setup-apkrepos.in ++++ b/setup-apkrepos.in +@@ -210,5 +210,5 @@ fi + + # clean up + if [ -n "$to_uninstall" ]; then +- apk del --quiet alpine-mirrors ++ apk del --quiet $to_uninstall + fi +-- +2.0.0 + diff --git a/main/alpine-conf/0001-setup-disk-fix-progressbar.patch b/main/alpine-conf/0001-setup-disk-fix-progressbar.patch new file mode 100644 index 000000000..566fe1c44 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-fix-progressbar.patch @@ -0,0 +1,26 @@ +From 0b5bf00f3cee569883b2dbee1649e24de4d88d7e Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Thu, 29 May 2014 15:07:49 +0200 +Subject: [PATCH] setup-disk: fix progressbar + +apk now sends progressbar to stdout instead of stderr +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index e7a063c..22053b1 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -323,7 +323,7 @@ EOF + chroot_caps=$(set_grsec chroot_caps 0) + init_chroot_mounts "$mnt" + apk add --root "$mnt" $apkflags --overlay-from-stdin \ +- $repoflags $pkgs <$ovlfiles>/dev/null ++ $repoflags $pkgs <$ovlfiles + local ret=$? + cleanup_chroot_mounts "$mnt" + set_grsec chroot_caps $chroot_caps > /dev/null +-- +2.0.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index fc6aa497e..552ee3517 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=alpine-conf pkgver=3.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -10,6 +10,9 @@ 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 + 0001-setup-apkrepos-fix-cleanup.patch + 0001-setup-disk-fix-progressbar.patch + " _builddir="$srcdir"/$pkgname-$pkgver @@ -38,10 +41,16 @@ package() { md5sums="905831b30cee21cbad64c2d6a0973516 alpine-conf-3.0.1.tar.xz df0d66fd6dcd63f1648b0768ed23df34 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch -109d4c00c3fa6f34ec9948a8a517787e 0001-setup-apkrepos-force-install-virtual-package.patch" +109d4c00c3fa6f34ec9948a8a517787e 0001-setup-apkrepos-force-install-virtual-package.patch +67ad1f462e426492402737db78597cdf 0001-setup-apkrepos-fix-cleanup.patch +ea7ba6f62309c81deffaeb73004b1bf5 0001-setup-disk-fix-progressbar.patch" sha256sums="928e37a835af314c313b85f166d51b1e2421e36191e987d0eb63aa4aa5a1b640 alpine-conf-3.0.1.tar.xz 56988a30777e6a7ed0391236aa94d3812ab4b9ee89a7866ce62ab4eb620145f2 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch -49c1914648feb972c7a9df71641c61e23851618ae6581de51d0223b04e133854 0001-setup-apkrepos-force-install-virtual-package.patch" +49c1914648feb972c7a9df71641c61e23851618ae6581de51d0223b04e133854 0001-setup-apkrepos-force-install-virtual-package.patch +7bffdd3ffbac435b8b283993c27aeed4f0dac6ff46c369956894b05af7c1c8c0 0001-setup-apkrepos-fix-cleanup.patch +06bd56bf618ed95b75383c29f8efc0f013e44e72c9ae92aaf2edf457bdd3738f 0001-setup-disk-fix-progressbar.patch" sha512sums="3ff48fe21dafa96cc43a71bbb227961c27f75e04a36dff7c0e2b8f5a6541e63156f692bd50e67f16f2c833b88a671327525f8d1f040dd1fd2982d341589bf309 alpine-conf-3.0.1.tar.xz 6188cfe76b6acd63c9c9906f590c025ea4d0d8b49c97c0c21dee93670fafda595668534b7fcbbe5095eae967d13fb742823fe1c69412f52341c18e3f5ea7901e 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch -f34a5e3cd82abc692e3ed793aead0f985b010bb5c44e16c7de9c130510d081536aab01f27d42ddd62053bdc53f06f6013f7951a97f6c1109e508774eb24ace6f 0001-setup-apkrepos-force-install-virtual-package.patch" +f34a5e3cd82abc692e3ed793aead0f985b010bb5c44e16c7de9c130510d081536aab01f27d42ddd62053bdc53f06f6013f7951a97f6c1109e508774eb24ace6f 0001-setup-apkrepos-force-install-virtual-package.patch +36e0b2426aea48cd347e4879855c21b9a445d78e43bc0e76a73710767193a1bed34804b2e2d998bf764dc31d38360503196212bbd29821e54fdb834d8f61095c 0001-setup-apkrepos-fix-cleanup.patch +79e68440b1478f5a88fab849a49773e1933e16e76ddf04d53a14c4fdcf719ef198140d6d36f280cc9a05eadf4bde0e0c7b11d278968771efbd72f76acba819da 0001-setup-disk-fix-progressbar.patch" -- cgit v1.2.3