From ecd7c5499508cb34ec909f0644a019cc8d65cdcb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 9 Nov 2010 10:28:29 +0000
Subject: main/mkinitfs: upgrade to 2.1.2

fixes #474

(cherry picked from commit ed232369d380b33d31b8cccb075f1fe59c72276b)
---
 ...mkinitfs-fix-for-running-without-b-option.patch | 34 ----------------------
 main/mkinitfs/APKBUILD                             |  9 ++----
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch

diff --git a/main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch b/main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch
deleted file mode 100644
index 2357d2dda3..0000000000
--- a/main/mkinitfs/0001-mkinitfs-fix-for-running-without-b-option.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 98fb74fadf3dc91a22b6aa11b4351e1a8ea3ef18 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 3 Nov 2010 13:02:12 +0000
-Subject: [PATCH] mkinitfs: fix for running without -b option
-
----
- mkinitfs.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mkinitfs.in b/mkinitfs.in
-index 8246d07..67981c4 100755
---- a/mkinitfs.in
-+++ b/mkinitfs.in
-@@ -16,7 +16,7 @@ _cp() {
- 	local i
- 	if [ -n "$list_sources" ]; then
- 		for i in "$@"; do
--			echo "$basedir"/$i
-+			echo "$basedir"/"$i"
- 		done
- 		return
- 	fi
-@@ -55,7 +55,7 @@ initfs_base() {
- 	done
- 	[ -z "$list_sources" ] && mkdir -p $dirs
- 
--	cd "$basedir"
-+	cd "${basedir:-/}"
- 	for file in $(feature_files "$filelists_dir"); do
- 		_cp $file
- 	done
--- 
-1.7.3.2
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 2564722944..a970586612 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,20 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=2.1.1
-pkgrel=1
+pkgver=2.1.2
+pkgrel=0
 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/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-mkinitfs-fix-for-running-without-b-option.patch
 	eglibc.patch
 	"
 license="GPL-2"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 -i "$srcdir"/0001-mkinitfs-fix-for-running-without-b-option.patch || return 1
 
 	# If we are using eglibc we need to include eglibc libs
 	# instead of uclibc libs.
@@ -32,6 +30,5 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="0bb08663748f8fe3578236ad161bf5e6  mkinitfs-2.1.1.tar.bz2
-50fbfe355bc13564299850db1c4c6862  0001-mkinitfs-fix-for-running-without-b-option.patch
+md5sums="e35426eb23b379a648500a353031e719  mkinitfs-2.1.2.tar.bz2
 e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch"
-- 
cgit v1.2.3