main/mkinitfs: upgrade to 2.7.1

3 files changed, 5 insertions, 87 deletions

diff --git a/main/mkinitfs/0001-init-fix-loading-of-fbcon.patch b/main/mkinitfs/0001-init-fix-loading-of-fbcon.patch
deleted file mode 100644
index 485229a2c3..0000000000
--- a/main/mkinitfs/0001-init-fix-loading-of-fbcon.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8427257b986105d09c4c287e739af152dc6ccfce Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 26 Nov 2014 13:53:23 +0000
-Subject: [PATCH] init: fix loading of fbcon
-
-we check if /sys/class/graphics/fb0 exists before loading fbcon and
-allow user to disable tiwh nofbcon as boot option
----
- initramfs-init.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 7831995..4b010f6 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -386,7 +386,7 @@ eval set -- `cat /proc/cmdline`
- 
- myopts="alpine_dev autodetect autoraid chart cryptroot cryptdm debug_init
- 	dma init_args keep_apk_new modules ovl_dev pkgs quiet root_size root
--	usbdelay ip alpine_repo apkovl alpine_start"
-+	usbdelay ip alpine_repo apkovl alpine_start nofbcon"
- 
- for opt; do
- 	case "$opt" in
-@@ -524,11 +524,11 @@ scan_drivers
- scan_drivers
- eend 0
- 
--ebegin "Setting up framebuffer console"
--if [ -d /lib/modules/`uname -r`/kernel/drivers/gpu ]; then
-+if [ -z "$KOPT_nofbcon" ] && [ -e /sys/class/graphics/fb0 ]; then
-+	ebegin "Setting up framebuffer console"
- 	modprobe -q fbcon &>/dev/null
-+	eend 0
- fi
--eend 0
- 
- # check if root=... was set
- if [ -n "$KOPT_root" ]; then
--- 
-2.1.3
-
diff --git a/main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch b/main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch
deleted file mode 100644
index 92e53a3838..0000000000
--- a/main/mkinitfs/0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8785cfa9ce642d8b4cde64ea0e4c497aa55a5780 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 17 Nov 2014 20:15:52 +0100
-Subject: [PATCH] init: lvm: run vgchange even if vgscan does not return
- success
-
-It seems like vgscan does not return success in initramfs, even if
-the needed devices noded are created.
-
-Ignore errors and try run vgchange in any case.
----
- initramfs-init.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 0ff8b6b..7831995 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -258,8 +258,8 @@ start_cryptsetup() {
- start_lvm() {
- 	[ -x /sbin/lvm ] || return
- 	modprobe dm-mod
--	lvm vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1 &&\
--		lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1
-+	lvm vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1
-+	lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1
- }
- 
- # determine the default interface to use if ip=dhcp is set
--- 
-2.1.3
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 23a7fd6538..49d7ce63a9 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,16 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=2.7.0
+pkgver=2.7.1
 _ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
 depends="busybox apk-tools>=2.0 lddtree>=1.25"
 install="$pkgname.pre-upgrade"
 triggers="$pkgname.trigger=/usr/share/kernel/*"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
-	0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch
-	0001-init-fix-loading-of-fbcon.patch
 	"
 arch="noarch"
 license="GPL-2"
@@ -36,12 +34,6 @@ package() {
 	cd "$_builddir"
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="fbf7a5ec2530490f9edd8df4541eff99  mkinitfs-2.7.0.tar.xz
-de01f4ac9c44fe84ce0022bd56f1f386  0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch
-324e26c1648699a1500add5095157220  0001-init-fix-loading-of-fbcon.patch"
-sha256sums="99019951e0ea914f00bf94dea69a0f9456bdb4f5934d8c6de3e5ed628b4734e6  mkinitfs-2.7.0.tar.xz
-a1ee3fdffbf2bf8311e8d37f6e8b3d6c0b787dc3e1e6a02bf45fa9dfe84baa33  0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch
-cfc5af8542966624ef7b5afc1f0c70117ae393d4446386dcf6940d2ef9d1885f  0001-init-fix-loading-of-fbcon.patch"
-sha512sums="ec0bad81773374ae7221da53cc889b3bddc2749c207715817f691ba1fbba5ee3967c1656283212525f0486a23b9b05379900473ee6188474bdbd6325ee50d1da  mkinitfs-2.7.0.tar.xz
-3f053f0956697cb38e1248b52365d033e22910ae44437a4f64eef85fe426a2f4e90b66557c06f053c8220466fc2f54c6d4de8da1a8db7466b4ddac4bf13372a7  0001-init-lvm-run-vgchange-even-if-vgscan-does-not-return.patch
-434af8d7867f13c6820ea2e45e53ce2d9129d664809c1a6605b5a1c8250dcec32109fecae47972853cf6b8cefc2fe1863c08d222cd95c5ee626bbf78c8a3bb15  0001-init-fix-loading-of-fbcon.patch"
+md5sums="9a815b988bb5be3ac3ab09e7904027e6  mkinitfs-2.7.1.tar.xz"
+sha256sums="152acf1f4f23b8919a79c6a29590cff2db594ad42dec1b60316e9740366ec43d  mkinitfs-2.7.1.tar.xz"
+sha512sums="632f9119dccf0911989e8d09d587a553327c9644fd75e50dd58a19590c0a1ac955de1a50a46c68aa711288c480c0408969c725832e9d2e7631ff8c64b12d0217  mkinitfs-2.7.1.tar.xz"