From 89285d731d09a4f898f5781ba1a52df1a4e25294 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 28 Apr 2011 15:52:35 +0000
Subject: main/mkinitfs: fix progressbar

fixes #613
---
 .../0001-init-fix-progressbar-when-not-quiet.patch | 27 ++++++++++++++++++++++
 main/mkinitfs/APKBUILD                             |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch

(limited to 'main/mkinitfs')

diff --git a/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch b/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch
new file mode 100644
index 000000000..7a82978f1
--- /dev/null
+++ b/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch
@@ -0,0 +1,27 @@
+From b9ad256b04db3965bf21ed7ee25ddfd7c166d102 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 27 Apr 2011 09:15:20 +0000
+Subject: [PATCH] init: fix progressbar when not quiet
+
+see http://bugs.alpinelinux.org/issues/613
+---
+ initramfs-init.in |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index 7b09722..a0e594d 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -462,6 +462,9 @@ fi
+ 
+ # install new root
+ ebegin "Installing packages to root filesystem"
++# insert newline unless quiet to fix progress bar
++[ -n "$KOPT_quiet" ] || echo ""
++
+ if [ "$KOPT_chart" = yes ]; then
+ 	pkgs="$pkgs acct"
+ fi
+-- 
+1.7.4.5
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 7831b005a..9820dc2d0 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
 pkgver=2.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
 depends="busybox apk-tools>=2.0"
 triggers="$pkgname.trigger:/usr/share/kernel/*"
 source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-init-fix-progressbar-when-not-quiet.patch
 	eglibc.patch
 	"
 arch="noarch"
@@ -35,7 +36,7 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make || return 1
+	make VERSION=$pkgver-r$pkgrel || return 1
 }
 
 package() {
@@ -43,4 +44,5 @@ package() {
 	make install DESTDIR="$pkgdir" || return 1
 }
 md5sums="abec6dced89e137dc60542c1e5f938ac  mkinitfs-2.3.4.tar.bz2
+4ea4389d5dff0a69d6792420574d2f1f  0001-init-fix-progressbar-when-not-quiet.patch
 e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch"
-- 
cgit v1.2.3