main/mkinitfs: upgrade to 3.8.1

both patches in release, already upgraded in 3.18

3 files changed, 4 insertions, 108 deletions

diff --git a/main/mkinitfs/0001-init-fix-tiny-cloud-runlevels.patch b/main/mkinitfs/0001-init-fix-tiny-cloud-runlevels.patch
deleted file mode 100644
index 3df763feb74..00000000000
--- a/main/mkinitfs/0001-init-fix-tiny-cloud-runlevels.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d738d380cb82cd5a40345a88fb14efe869e95db4 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 24 May 2023 17:13:27 +0200
-Subject: [PATCH] init: fix tiny-cloud runlevels
-
-The tiny-cloud services got renamed. Adjust accordingly.
-
-ref: https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud/-/merge_requests/82
----
- initramfs-init.in | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 8b961fd..96704a1 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -700,8 +700,9 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then
- 
- 	if findfs LABEL=cidata >/dev/null 2>&1 || findfs LABEL=CIDATA >/dev/null 2>&1; then
- 		pkgs="$pkgs tiny-cloud-alpine ifupdown-ng"
--		rc_add tiny-cloud-early boot
--		rc_add tiny-cloud default
-+		rc_add tiny-cloud-boot boot
-+		rc_add tiny-cloud-early default
-+		rc_add tiny-cloud-main default
- 		rc_add tiny-cloud-final default
- 	fi
- 
--- 
-2.40.1
-
diff --git a/main/mkinitfs/0001-init-improve-detection-of-serial-consoles.patch b/main/mkinitfs/0001-init-improve-detection-of-serial-consoles.patch
deleted file mode 100644
index 6f30a0798de..00000000000
--- a/main/mkinitfs/0001-init-improve-detection-of-serial-consoles.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 317c1ec274c84e39e3f777a81e6484aa768e58ef Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 15 May 2023 08:54:34 +0200
-Subject: [PATCH] init: improve detection of serial consoles
-
-fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/14927
----
- initramfs-init.in         | 9 +++++++--
- tests/initramfs-init.test | 9 +++++++++
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 00a681d..8b961fd 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -104,17 +104,22 @@ list_console_devices() {
- 	done
- }
- 
--detect_serial_console() {
-+detect_serial_consoles() {
- 	local n=$(awk '$7 ~ /CTS/ || $7 ~ /DSR/ { print $1 }' "$ROOT"/proc/tty/driver/serial 2>/dev/null)
- 	if [ -n "$n" ]; then
- 		echo ttyS${n%:}
- 	fi
-+	for i in "$ROOT"/sys/class/tty/*; do
-+		if [ -e "$i"/device ]; then
-+			echo ${i##*/}
-+		fi
-+	done
- }
- 
- setup_inittab_console() {
- 	term=vt100
- 	# Inquire the kernel for list of console= devices
--	consoles="$(for c in console $KOPT_consoles $(detect_serial_console); do list_console_devices $c; done)"
-+	consoles="$(for c in console $KOPT_consoles $(detect_serial_consoles); do list_console_devices $c; done)"
- 	for tty in $consoles; do
- 		# ignore tty devices that gives I/O error
- 		if ! stty -g -F /dev/$tty >/dev/null 2>/dev/null; then
-diff --git a/tests/initramfs-init.test b/tests/initramfs-init.test
-index 4c49aa1..f1ae6ae 100755
---- a/tests/initramfs-init.test
-+++ b/tests/initramfs-init.test
-@@ -134,11 +134,20 @@ initramfs_init_tmpfs_root_autodetect_serial_body() {
- 		3: uart:unknown port:000002E8 irq:3
- 	EOF
- 
-+	mkdir -p sys/devices/platform/ARMH0011:00/tty/ttyAMA0
-+	ln -s ../../../ARMH0011:00 \
-+		sys/devices/platform/ARMH0011:00/tty/ttyAMA0/device
-+
-+	mkdir -p sys/class/tty/
-+	ln -s ../../devices/platform/ARMH0011:00/tty/ttyAMA0 \
-+		sys/class/tty/ttyAMA0
-+
- 	atf_check \
- 		-o ignore \
- 		initramfs-init
- 	atf_check \
- 		-o match:"ttyS0::respawn:/sbin/getty" \
-+		-o match:"ttyAMA0::respawn:/sbin/getty" \
- 		cat sysroot/etc/inittab
- }
- 
--- 
-2.40.1
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index d0217dd74c9..4450ceb24c9 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=3.8.0
+pkgver=3.8.1
 # shellcheck disable=SC2034 # used for git versions, keep around for next time
 _ver=${pkgver%_git*}
-pkgrel=5
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url="https://gitlab.alpinelinux.org/alpine/mkinitfs"
 arch="all"
@@ -23,10 +23,7 @@ depends="
 subpackages="$pkgname-doc"
 install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
 triggers="$pkgname.trigger=/usr/share/kernel/*"
-source="https://gitlab.alpinelinux.org/alpine/mkinitfs/-/archive/$pkgver/mkinitfs-$pkgver.tar.gz
-	0001-init-improve-detection-of-serial-consoles.patch
-	0001-init-fix-tiny-cloud-runlevels.patch
-	"
+source="https://gitlab.alpinelinux.org/alpine/mkinitfs/-/archive/$pkgver/mkinitfs-$pkgver.tar.gz"
 
 provides="initramfs-generator"
 provider_priority=900 # highest
@@ -40,7 +37,5 @@ package() {
 }
 
 sha512sums="
-0f9dc966dacc125c0dd15ec7f23c4204c8a10f2d8d6d38a867ad95e40de76f2622a49f5540f8cd510be538cc36c8aaafffd0f424b0e1320050a9d96775afe98c  mkinitfs-3.8.0.tar.gz
-247ad24028c70fa2333cebc4a62ffc723612dd965b622465c64181976c539d608ef38e0055ddab35a06ddb0410e4ab17ed06b1d39c560b24be05f24917fc1c71  0001-init-improve-detection-of-serial-consoles.patch
-7d09f4ad0f445b54ee07acbc7284507877e6814176b473ceab1ddd102af526b7705db828156134ef6f1f689e34c5d3cb459ee9824668e43d6e688c81e347335d  0001-init-fix-tiny-cloud-runlevels.patch
+f30398875f07c2dafc98ff6bbf82e8414c0f275b7ee7e6b6ae485c482b4f9f01175916b73c853df7a5528164e7f9cca574c7a67a668bf41cf74314dc3111a857  mkinitfs-3.8.1.tar.gz
 "