main/mkinitfs: upgrade to 2.4.0

5 files changed, 4 insertions, 281 deletions

diff --git a/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch b/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch
deleted file mode 100644
index 7a82978f1..000000000
--- a/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/0001-mkinitfs-add-squashfs-support.patch b/main/mkinitfs/0001-mkinitfs-add-squashfs-support.patch
deleted file mode 100644
index 6296b74bd..000000000
--- a/main/mkinitfs/0001-mkinitfs-add-squashfs-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5ca5dcc3002c21637c99b7b022fc47d6d776486e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Sat, 27 Aug 2011 12:33:22 +0000
-Subject: [PATCH 1/2] mkinitfs: add squashfs support
-
----
- Makefile           |    1 +
- modules.d/squashfs |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
- create mode 100644 modules.d/squashfs
-
-diff --git a/Makefile b/Makefile
-index a25444f..c986e10 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,6 +26,7 @@ CONF_FILES	:= mkinitfs.conf \
- 		modules.d/raid \
- 		modules.d/reiserfs \
- 		modules.d/scsi \
-+		modules.d/squashfs \
- 		modules.d/ubifs \
- 		modules.d/usb \
- 		modules.d/virtio \
-diff --git a/modules.d/squashfs b/modules.d/squashfs
-new file mode 100644
-index 0000000..bf93fbc
---- /dev/null
-+++ b/modules.d/squashfs
-@@ -0,0 +1 @@
-+kernel/fs/squashfs
--- 
-1.7.6.1
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index bf93bc273..2067ae142 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,16 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=2.3.4
-pkgrel=5
+pkgver=2.4.0
+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.git/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-init-fix-progressbar-when-not-quiet.patch
-	mount-move.patch
-	delay-umount-apkovl.patch
-	0001-mkinitfs-add-squashfs-support.patch
 	eglibc.patch
 	"
 arch="noarch"
@@ -31,7 +27,7 @@ prepare() {
 			esac
 			;;
 		*.patch)
-			patch -p1 -i "$srcdir"/$i || return 1
+			msg $i; patch -p1 -i "$srcdir"/$i || return 1
 			;;
 		esac
 	done
@@ -46,9 +42,5 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="abec6dced89e137dc60542c1e5f938ac  mkinitfs-2.3.4.tar.bz2
-4ea4389d5dff0a69d6792420574d2f1f  0001-init-fix-progressbar-when-not-quiet.patch
-049392dd315240d2c7d892ef67072e03  mount-move.patch
-6d8b0a6f3b7a90152d84eda373743d84  delay-umount-apkovl.patch
-2632949239ddcd680cfc0c7ffab75024  0001-mkinitfs-add-squashfs-support.patch
+md5sums="3b7ca4f70bdded5fca0c0c70ddac56f6  mkinitfs-2.4.0.tar.bz2
 e59c2f7de496fe430b07e32fd812ebe0  eglibc.patch"
diff --git a/main/mkinitfs/delay-umount-apkovl.patch b/main/mkinitfs/delay-umount-apkovl.patch
deleted file mode 100644
index 983008b3f..000000000
--- a/main/mkinitfs/delay-umount-apkovl.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/initramfs-init.in b/initramfs-init.in
-index f64ef26..8f01c8f 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -244,8 +244,8 @@ resolve_dev() {
- 	esac
- }
- 
--# remount ALPINE_MNT according given fstab
--remount_alpine_mnt() {
-+# relocate ALPINE_MNT according given fstab
-+relocate_alpine_mnt() {
- 	local fstab="$1"
- 	local mnt=$(find_mnt $ALPINE_DEV $fstab)
- 	if [ "$ALPINE_MNT" != "$mnt" ]; then
-@@ -253,10 +253,6 @@ remount_alpine_mnt() {
- 		mount -o move $ALPINE_MNT $mnt
- 		ALPINE_MNT=$mnt
- 	fi
--	# respect users mount options in fstab
--	if [ -n "$MNTOPTS" ]; then
--		mount -o remount,$MNTOPTS "$ALPINE_MNT"
--	fi
- }
- 
- # gotta start from somewhere :)
-@@ -458,7 +454,6 @@ if [ -f "$ovl" ]; then
- 	eend $? $errstr || ovlfiles=
- 	# hack, incase /root/.ssh was included in apkovl
- 	[ -d "$sysroot/root" ] && chmod 700 "$sysroot/root"
--	umount $ovl_unmount 2>/dev/null &
- 	pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)"
- 	rm -f "$sysroot"/etc/lbu/packages.list
- 	pkgs="$pkgs $(cat $sysroot/var/lib/apk/world $sysroot/etc/apk/world 2>/dev/null)"
-@@ -480,12 +475,19 @@ else
- 	rc_add savecache shutdown
- fi
- 
--# let user override tmpfs size in fstab in apkovl
- if [ -f $sysroot/etc/fstab ]; then
-+	has_fstab=1
-+
-+	# let user override tmpfs size in fstab in apkovl
- 	mountopts=$(awk '$2 == "/" && $3 == "tmpfs" { print $4 }' $sysroot/etc/fstab)
- 	if [ -n "$mountopts" ]; then
- 		mount -o remount,$mountopts $sysroot
- 	fi
-+
-+	# move the ALPINE_MNT if ALPINE_DEV is specified in users fstab
-+	# this is so a generated /etc/apk/repositories will use correct
-+	# mount dir
-+	relocate_alpine_mnt "$sysroot"/etc/fstab
- fi
- 
- # in case we upgrade we might need those:
-@@ -496,13 +498,6 @@ rc_add modloop sysinit
- # hack so we get openrc
- pkgs="$pkgs alpine-base"
- 
--# move the ALPINE_MNT if ALPINE_DEV is specified in users fstab
--# this is so a generated /etc/apk/repositories will use correct mount dir
--if [ -f "$sysroot"/etc/fstab ]; then
--	has_fstab=1
--	remount_alpine_mnt "$sysroot"/etc/fstab
--fi
--
- # copy keys so apk finds them. apk looks for stuff relative --root
- mkdir -p $sysroot/etc/apk/keys/
- cp -a /etc/apk/keys $sysroot/etc/apk
-@@ -537,11 +532,23 @@ else
- fi
- eend $?
- 
-+# unmount ovl mount if needed
-+if [ -n "$ovl_unmount" ]; then
-+	umount $ovl_unmount 2>/dev/null
-+fi
-+
- # remount ALPINE_MNT according default fstab from package
- if [ -z "$has_fstab" ] && [ -f "$sysroot"/etc/fstab ]; then
--	remount_alpine_mnt "$sysroot"/etc/fstab
-+	relocate_alpine_mnt "$sysroot"/etc/fstab
- fi
- 
-+# respect mount options in fstab for ALPINE_MNT (e.g if user wants rw)
-+opts=$(awk "\$2 == \"$ALPINE_MNT\" {print \$4}" $sysroot/etc/fstab)
-+if [ -n "$opts" ]; then
-+	mount -o remount,$opts "$ALPINE_MNT"
-+fi
-+
-+
- # fix inittab if alternative console
- setup_inittab_console $CONSOLE
- 
diff --git a/main/mkinitfs/mount-move.patch b/main/mkinitfs/mount-move.patch
deleted file mode 100644
index 493166324..000000000
--- a/main/mkinitfs/mount-move.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 2ff2585..f64ef26 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -104,10 +104,32 @@ unpack_apkovl() {
- }
- 
- # find mount dir for given device in an fstab
-+# returns global MNTOPTS
- find_mnt() {
--	local dev="$1"
--	local fsfile="$2"
--	awk "\$1 == \"$dev\" {print \$2}\"" "$fsfile" 2>/dev/null
-+	local search_dev="$1" fstab="$2"
-+	MNTOPTS=
-+	[ -r "$fstab" ] || return 1
-+	local dev mnt fs chk
-+	case "$search_dev" in
-+		UUID=*|LABEL=*|/dev/*);;
-+		*) search_dev=/dev/$search_dev;;
-+	esac
-+	local search_real_dev=$(resolve_dev $search_dev)
-+	while read dev mnt fs MNTOPTS chk; do
-+		local real_dev=$(resolve_dev $dev)
-+		local i j
-+		for i in "$search_dev" "$search_real_dev"; do
-+			[ -z "$i" ] && continue
-+			for j in "$dev" "$real_dev"; do
-+				[ -z "$j" ] && continue
-+				if [ "$i" = "$j" ]; then
-+					echo "$mnt"
-+					return
-+				fi
-+			done
-+		done
-+	done < $fstab
-+	MNTOPTS=
- }
- 
- # Wait for usb to settle
-@@ -214,6 +236,29 @@ start_lvm() {
- 		lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1
- }
- 
-+# resolve an uuid or symlink to the real device
-+resolve_dev() {
-+	case "$1" in
-+	UUID=*|LABEL=*) findfs "$1";;
-+	*) readlink -f "$1";;
-+	esac
-+}
-+
-+# remount ALPINE_MNT according given fstab
-+remount_alpine_mnt() {
-+	local fstab="$1"
-+	local mnt=$(find_mnt $ALPINE_DEV $fstab)
-+	if [ "$ALPINE_MNT" != "$mnt" ]; then
-+		mkdir -p "$mnt"
-+		mount -o move $ALPINE_MNT $mnt
-+		ALPINE_MNT=$mnt
-+	fi
-+	# respect users mount options in fstab
-+	if [ -n "$MNTOPTS" ]; then
-+		mount -o remount,$MNTOPTS "$ALPINE_MNT"
-+	fi
-+}
-+
- # gotta start from somewhere :)
- echo "Alpine Init $VERSION"
- 
-@@ -270,7 +315,7 @@ if [ -n "$KOPT_ovl_dev" ] ; then
- fi
- 
- case "$ALPINE_DEV" in
--	UUID=*) ;;
-+	UUID=*|LABEL=*) ;;
- 	*) ALPINE_DEV=/dev/$ALPINE_DEV ;;
- esac
- 	
-@@ -453,20 +498,9 @@ pkgs="$pkgs alpine-base"
- 
- # move the ALPINE_MNT if ALPINE_DEV is specified in users fstab
- # this is so a generated /etc/apk/repositories will use correct mount dir
--new_mnt=$(find_mnt $ALPINE_DEV $sysroot/etc/fstab)
--if [ -n "$new_mnt" ] && [ "$new_mnt" != "$ALPINE_MNT" ]; then
--	mkdir -p $new_mnt
--	mount -o move $ALPINE_MNT $new_mnt
--	ALPINE_MNT="$new_mnt"
--fi
--
--# let user set ALPINE_MNT as readonly in fstab
--if [ -f $sysroot/etc/fstab ]; then
--	mountopts=$(awk "\$2 == \"$ALPINE_MNT\" { print \$4 }" \
--		$sysroot/etc/fstab)
--	if [ -n "$mountopts" ]; then
--		mount -o remount,$mountopts $ALPINE_MNT
--	fi
-+if [ -f "$sysroot"/etc/fstab ]; then
-+	has_fstab=1
-+	remount_alpine_mnt "$sysroot"/etc/fstab
- fi
- 
- # copy keys so apk finds them. apk looks for stuff relative --root
-@@ -503,6 +537,11 @@ else
- fi
- eend $?
- 
-+# remount ALPINE_MNT according default fstab from package
-+if [ -z "$has_fstab" ] && [ -f "$sysroot"/etc/fstab ]; then
-+	remount_alpine_mnt "$sysroot"/etc/fstab
-+fi
-+
- # fix inittab if alternative console
- setup_inittab_console $CONSOLE
-