main/mkinitfs: upgrade to 2.8.0

4 files changed, 5 insertions, 138 deletions

diff --git a/main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch b/main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch
deleted file mode 100644
index 47c919138d..0000000000
--- a/main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2ec7750ef7d4c6a443b0fb04b1627efabb9d7c03 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Tue, 2 Dec 2014 10:34:35 +0200
-Subject: [PATCH] init: fix splash fifo, and make config file optional
-
-just having the fbsplash.ppm in boot media activates now splash.
----
- initramfs-init.in | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index ecab5dd..6357965 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -677,9 +677,17 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then
- 	rm -f "$sysroot/etc/.default_boot_services"
- fi
- 
--if [ "$KOPT_splash" != "no" -a -e $ALPINE_MNT/fbsplash.ppm -a -e $ALPINE_MNT/fbsplash.cfg ]; then
-+if [ "$KOPT_splash" != "no" -a -e $ALPINE_MNT/fbsplash.ppm ]; then
-+	local config
- 	ebegin "Starting bootsplash (from $ALPINE_MNT)"
--	setsid fbsplash -T 16 -s $ALPINE_MNT/fbsplash.ppm -i $ALPINE_MNT/fbsplash.cfg -f $sysroot/$splashfile &
-+	mkfifo $sysroot/$splashfile
-+	if [ -e $ALPINE_MNT/fbsplash.cfg ]; then
-+		config=$ALPINE_MNT/fbsplash.cfg
-+	else
-+		config=/tmp/fbsplash.cfg
-+		echo "IMAGE_ALIGN=CM" > $config
-+	fi
-+	setsid fbsplash -T 16 -s $ALPINE_MNT/fbsplash.ppm -i $config -f $sysroot/$splashfile &
- 	eend 0
- else
- 	KOPT_splash="no"
--- 
-2.2.0
-
diff --git a/main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch b/main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch
deleted file mode 100644
index e297b60182..0000000000
--- a/main/mkinitfs/0001-init-resolve-UUID-.-devices-for-cryptsetup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 979090f14647d6e6b0c0d399580c22cbf48b0fef Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 10 Mar 2015 09:20:34 +0000
-Subject: [PATCH] init: resolve UUID=... devices for cryptsetup
-
-recent version of cryptsetup does not seem to work with UUID=... devices
-unless udev is used to create /dev/disk/by-uuid symlinks.
-
-We work around that by resolving UUID=... to the device.
----
- initramfs-init.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index fd3e510..d687e64 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -251,7 +251,7 @@ start_cryptsetup() {
- 	modprobe dm-crypt
- 	if [ -n "$KOPT_cryptroot" ]; then
- 		modprobe dm-crypt
--		cryptsetup luksOpen "$KOPT_cryptroot" "$KOPT_cryptdm"
-+		cryptsetup luksOpen $(resolve_dev "$KOPT_cryptroot") "$KOPT_cryptdm"
- 	fi
- }
- 
--- 
-2.3.2
-
diff --git a/main/mkinitfs/0002-support-for-tmpfs-overlay-over-root.patch b/main/mkinitfs/0002-support-for-tmpfs-overlay-over-root.patch
deleted file mode 100644
index cbeeef99e6..0000000000
--- a/main/mkinitfs/0002-support-for-tmpfs-overlay-over-root.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From af4168c70ec5fc1982c83dc22d75de2ba6aa30d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sat, 7 Feb 2015 22:21:32 +0200
-Subject: [PATCH] support for tmpfs overlay over root
-
-useful if wanting to optimize boot time, and do device updates
-via read-only system image. package management is not too useful
-in these situations.
----
- features.d/base.modules |  1 +
- initramfs-init.in       | 14 ++++++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/features.d/base.modules b/features.d/base.modules
-index 038335d..f8f271d 100644
---- a/features.d/base.modules
-+++ b/features.d/base.modules
-@@ -1 +1,2 @@
- kernel/drivers/block/loop.ko
-+kernel/fs/overlayfs
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 6357965..fd3e510 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -387,7 +387,8 @@ 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 splash blacklist"
-+	usbdelay ip alpine_repo apkovl alpine_start splash blacklist
-+	overlaytmpfs"
- 
- for opt; do
- 	case "$opt" in
-@@ -544,7 +545,16 @@ if [ -n "$KOPT_root" ]; then
- 		start_$i
- 	done
- 	ebegin "Mounting root"
--	retry_mount -o ro $KOPT_root $sysroot 2>/dev/null
-+	if [ "$KOPT_overlaytmpfs" = "yes" ]; then
-+		mkdir -p /media/root-ro /media/root-rw $sysroot/media/root-ro $sysroot/media/root-rw
-+		retry_mount -o ro $KOPT_root /media/root-ro 2>/dev/null
-+		mount -t tmpfs root-tmpfs /media/root-rw
-+		mkdir -p /media/root-rw/work /media/root-rw/root
-+		mount -t overlay -o lowerdir=/media/root-ro,upperdir=/media/root-rw/root,workdir=/media/root-rw/work overlayfs $sysroot
-+	else
-+		retry_mount -o ro $KOPT_root $sysroot 2>/dev/null
-+	fi
-+
- 	eend $?
- 	cat /proc/mounts | while read DEV DIR TYPE OPTS ; do
- 		if [ "$DIR" != "/" -a "$DIR" != "$sysroot" -a -d "$DIR" ]; then
--- 
-2.2.2
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index ce8bbffcc8..039b1890da 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,17 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=2.7.1
+pkgver=2.8.0
 _ver=${pkgver%_git*}
-pkgrel=4
+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-fix-splash-fifo-and-make-config-file-optional.patch
-	0002-support-for-tmpfs-overlay-over-root.patch
-	0001-init-resolve-UUID-.-devices-for-cryptsetup.patch
 	"
 arch="noarch"
 license="GPL-2"
@@ -37,15 +34,6 @@ package() {
 	cd "$_builddir"
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="9a815b988bb5be3ac3ab09e7904027e6  mkinitfs-2.7.1.tar.xz
-68c2d5e5e15b6f691f39b8c26dd9514a  0001-init-fix-splash-fifo-and-make-config-file-optional.patch
-d70426b776b5ae61f6712c19f6e7d203  0002-support-for-tmpfs-overlay-over-root.patch
-c92cf3e9dbd8fa32254dc66d7a649fae  0001-init-resolve-UUID-.-devices-for-cryptsetup.patch"
-sha256sums="152acf1f4f23b8919a79c6a29590cff2db594ad42dec1b60316e9740366ec43d  mkinitfs-2.7.1.tar.xz
-8d6b5f6b2024dce0c26846966b236513726ced6d61eca335524b5759f957ecda  0001-init-fix-splash-fifo-and-make-config-file-optional.patch
-6c7b08c9e38f7816cfcd8519c9622b7252a90769898e705e2a16f1112a99f96a  0002-support-for-tmpfs-overlay-over-root.patch
-5385b4f03f77f71c79ca46d0c412193b70290d1da37350291f6daec00cbbe166  0001-init-resolve-UUID-.-devices-for-cryptsetup.patch"
-sha512sums="632f9119dccf0911989e8d09d587a553327c9644fd75e50dd58a19590c0a1ac955de1a50a46c68aa711288c480c0408969c725832e9d2e7631ff8c64b12d0217  mkinitfs-2.7.1.tar.xz
-4cbfc985974b427c6136b28777c39ffd6963bb876d902c182853e7af8311265d2516f6638ea7fb818ddba3a0bdd9109080d62efaedb514b8e6cbea09812adefa  0001-init-fix-splash-fifo-and-make-config-file-optional.patch
-d6eade69168f1349abffb732f50630dbab9f11d655814076479b2523d2a4920629e6d6e51f86678207b5f80775bd9d672ca08df36c1fd6eb88535abb7b8df911  0002-support-for-tmpfs-overlay-over-root.patch
-6ee4bc5448b30bd0d458ff47dc8fe48cc22e1489bbd52464adc54697dfb3bc5a7bd92cdedab49fafb059bf79ffe5ff39cc94280cf17d029d4d0f9addb972ee71  0001-init-resolve-UUID-.-devices-for-cryptsetup.patch"
+md5sums="1a321336d97b22257349ddd36884ec34  mkinitfs-2.8.0.tar.xz"
+sha256sums="5ffe4c5ec9e0ff4581e5b24301fd30d0964120d6b30ee78ea79f31ff48eeab73  mkinitfs-2.8.0.tar.xz"
+sha512sums="c103003f95c7d7d94daa41d0a81b210a0208c93d77203978554fb127a21e2f143b56990865fc53e2c5c732ef663603b297da63d31f915b1e3a3e0f3818aa8f2e  mkinitfs-2.8.0.tar.xz"