Feat: myMPDos 1.6.0

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 https://github.com/jcorporation/myMPDos/
 
+***
+
+## myMPDos v1.6.0 (2024-12-05)
+
+This release is build up on Alpine Linux 3.21.0.
+
+### Changelog
+
+- Alpine Linux 3.21.0
+- MPD 0.23.16
+
+***
+
 ## myMPD v1.5.4 (2024-11-01)
 
 This is a small maintenance release.

build.sh

@@ -131,9 +131,9 @@ build_stage2() {
 
   echo "Patching initramfs"
   cd "$TMPDIR/netboot" || exit 1
-  rm -f "init"
-  gzip -dc "boot/$INITRAMFS" | cpio -id init
-  if ! patch init "$STARTPATH/mympdos/netboot/init.patch"
+  #rm -f "init"
+  #gzip -dc "boot/$INITRAMFS" | cpio -id init
+  if ! cp "$STARTPATH/mympdos/netboot/init.mympd" init
   then
     echo "Patching netboot init failed"
     exit 1

config

@@ -2,12 +2,12 @@
 # myMPDos (c) 2020-2024 Juergen Mang <[email protected]>
 # https://github.com/jcorporation/myMPDos
 
-VERSION="1.5.4"
+VERSION="1.6.0"
 
 ARCH="aarch64"
 BUILDIMAGE="myMPDos-build.img"
-ALPINE_MAJOR_VERSION="3.20"
-ALPINE_MINOR_VERSION="3"
+ALPINE_MAJOR_VERSION="3.21"
+ALPINE_MINOR_VERSION="0"
 ALPINE_VERSION="${ALPINE_MAJOR_VERSION}.${ALPINE_MINOR_VERSION}"
 ALPINE_MIRROR="http://dl-cdn.alpinelinux.org/alpine"
 COMPRESSIMAGE="false"

mympdos/build/mympdos-base/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <[email protected]>
 pkgname=mympdos-base
 pkgver=0.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc="myMPDos base package"
 url="https://github.com/jcorporation/myMPDos"
 arch="noarch"

mympdos/build/mympdos-libgpiod2/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <[email protected]>
 pkgname=mympdos-libgpiod2
 pkgver=2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="C library and tools for interacting with the linux GPIO character device"
 url="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
 arch="all"

mympdos/build/mympdos-libmpdclient/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <[email protected]>
 pkgname=mympdos-libmpdclient
 pkgver=2.23
-pkgrel=3
+pkgrel=4
 pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages"
 url="https://github.com/jcorporation/libmympdclient"
 arch="all"

mympdos/build/mympdos-mpc/APKBUILD

@@ -2,7 +2,7 @@
 # Based on: https://git.alpinelinux.org/aports/tree/community/mpc/APKBUILD?h=3.18-stable
 pkgname=mympdos-mpc
 pkgver=0.36
-pkgrel=2
+pkgrel=3
 pkgdesc="Minimalist command line interface to MPD"
 url="https://www.musicpd.org/clients/mpc/"
 arch="all"

mympdos/build/mympdos-mpd-master/APKBUILD

@@ -2,7 +2,7 @@
 # Based on: https://pkgs.alpinelinux.org/package/edge/community/x86_64/mpd
 pkgname=mympdos-mpd-master
 pkgver=0.24.0
-pkgrel=24
+pkgrel=25
 pkgdesc="Music daemon that plays MP3, FLAC and Ogg Vorbis files"
 url="https://musicpd.org"
 pkgusers="mpd"

mympdos/build/mympdos-mpd-stable/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Juergen Mang <[email protected]>
 # Based on: https://pkgs.alpinelinux.org/package/edge/community/x86_64/mpd
 pkgname=mympdos-mpd-stable
-pkgver=0.23.15
-pkgrel=1
+pkgver=0.23.16
+pkgrel=0
 pkgdesc="Music daemon that plays MP3, FLAC and Ogg Vorbis files"
 url="https://musicpd.org"
 pkgusers="mpd"

mympdos/netboot/init.mympd

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # this is the init script version
-VERSION=3.9.1-r0
+VERSION=3.11.1-r0
 SINGLEMODE=no
 sysroot="$ROOT"/sysroot
 splashfile=/.splash.ctrl
@@ -146,17 +146,17 @@ setup_inittab_console() {
 ethernets() {
 	for i in "$ROOT/sys/class/net/"*; do
 		local iface="${i##*/}"
-		case "$iface" in
-			eth*) echo "$(cat "$i/ifindex") $iface";;
-		esac
+		if [ -d "$i/device" ]; then
+			echo "$(cat "$i/ifindex") $iface"
+		fi
 	done | sort -n | awk '{print $2}'
 }
 
 # find the interface that is has operstate up
 find_first_interface_up() {
 	local n=0
 	[ $# -eq 0 ] && return 0
-	while [ "$n" -le "${LINK_WAIT_MAX:-10}" ]; do
+	while [ "$n" -le "${LINK_WAIT_MAX:-40}" ]; do
 		for i in "$@"; do
 			if grep -q -F -x "up" "$ROOT/sys/class/net/$i/operstate"; then
 				echo "$i"
@@ -209,6 +209,10 @@ configure_ip() {
 		dhcp) autoconf="dhcp";;
 	esac
 
+	if [ -e "$ROOT"/etc/mactab ]; then
+		$MOCK nameif -s
+	fi
+
 	if [ -z "$iface" ] && [ -n "$KOPT_BOOTIF" ]; then
 		mac=$(printf "%s\n" "$KOPT_BOOTIF"|sed 's/^01-//;s/-/:/g')
 		iface=$(grep -l "$mac" "$ROOT"/sys/class/net/*/address | awk -F/ '{print $(NF-1); exit}')
@@ -297,9 +301,9 @@ remount_fstab_entry() {
 # find the dirs under ALPINE_MNT that are boot repositories
 find_boot_repositories() {
 	if [ -n "$ALPINE_REPO" ]; then
-		echo "$ALPINE_REPO"
+		echo "$ALPINE_REPO" | tr ',' '\n'
 	else
-		find /media/* -maxdepth 3 -name .boot_repository -type f \
+		find "$ROOT"/media/* -maxdepth 3 -name .boot_repository -type f \
 			| sed 's:/.boot_repository$::'
 	fi
 }
@@ -387,16 +391,38 @@ want_tiny_cloud() {
 	if [ -f "$sysroot/etc/tiny-cloud.disabled" ]; then
 		return 1
 	fi
-	case "$KOPT_ds" in
-		nocloud*) return 0;;
-	esac
-	if grep -q "^ds=nocloud" "$ROOT"/sys/class/dmi/id/product_serial 2>/dev/null; then
+	if [ -n "$KOPT_ds" ] || [ "$KOPT_tinycloud" ]; then
+		return 0
+	fi
+	if grep -q "^ds=" "$ROOT"/sys/class/dmi/id/product_serial 2>/dev/null; then
 		return 0
 	fi
 	findfs LABEL=cidata >/dev/null 2>&1 || findfs LABEL=CIDATA >/dev/null 2>&1
 }
 
-/bin/busybox mkdir -p "$ROOT"/usr/bin \
+resume_from_disk () {
+	if [ -z "$KOPT_resume" ]; then
+		return
+	fi
+	if [ ! -e "$ROOT"/sys/power/resume ]; then
+		echo "resume: no hibernation support found"
+		return
+	fi
+	echo "Resume from disk"
+	case "$KOPT_resume" in
+	UUID*|LABEL*) resume_dev=$(findfs "$KOPT_resume");;
+	*) resume_dev="$KOPT_resume";;
+	esac
+	printf "%d:%d" $(stat -Lc "0x%t 0x%T" "$resume_dev") > "$ROOT"/sys/power/resume
+	if [ -n "$KOPT_resume_offset" ]; then
+		echo "$KOPT_resume_offset" > "$ROOT"/sys/power/resume_offset
+	fi
+}
+
+/bin/busybox mkdir -p \
+	"$ROOT"/bin \
+	"$ROOT"/sbin \
+	"$ROOT"/usr/bin \
 	"$ROOT"/usr/sbin \
 	"$ROOT"/proc \
 	"$ROOT"/sys \
@@ -442,11 +468,50 @@ $MOCK mount -t tmpfs -o nodev,nosuid,noexec shm /dev/shm
 #  acpi_osi="!Windows 2006" xen-pciback.hide=(01:00.0)
 set -- $(cat "$ROOT"/proc/cmdline)
 
-myopts="autodetect_serial chart cryptroot cryptdm cryptheader cryptoffset
-	cryptdiscards cryptkey debug_init ds init init_args keep_apk_new modules
-	pkgs quiet root_size root usbdelay ip alpine_repo apkovl splash
-	blacklist overlaytmpfs overlaytmpfsflags rootfstype rootflags nbd resume s390x_net
-	dasd ssh_key BOOTIF zfcp uevent_buf_size aoe aoe_iflist aoe_mtu wireguard"
+myopts="BOOTIF
+	alpine_repo
+	aoe
+	aoe_iflist
+	aoe_mtu
+	apkovl
+	autodetect_serial
+	blacklist
+	chart
+	cryptdiscards
+	cryptdm
+	cryptheader
+	cryptkey
+	cryptoffset
+	cryptroot
+	dasd
+	debug_init
+	ds
+	init
+	init_args
+	ip
+	keep_apk_new
+	modules
+	nbd
+	overlaytmpfs
+	overlaytmpfsflags
+	pkgs
+	quiet
+	resume
+	resume_offset
+	root
+	root_size
+	rootflags
+	rootfstype
+	s390x_net
+	splash
+	ssh_key
+	tinycloud
+	uevent_buf_size
+	usbdelay
+	usrflags
+	wireguard
+	zfcp
+"
 
 for opt; do
 	case "$opt" in
@@ -493,7 +558,7 @@ done
 # start bootcharting if wanted
 if [ "$KOPT_chart" = yes ]; then
 	ebegin "Starting bootchart logging"
-	$MOCK /sbin/bootchartd start-initfs "$sysroot"
+	$MOCK /sbin/bootchartd start-initfs
 	eend 0
 fi
 
@@ -649,18 +714,7 @@ if [ -n "$KOPT_root" ]; then
 			echo "Failed to scan devices for btrfs filesystem."
 	fi
 
-	if [ -n "$KOPT_resume" ]; then
-		echo "Resume from disk"
-		if [ -e /sys/power/resume ]; then
-			case "$KOPT_resume" in
-			UUID*|LABEL*) resume_dev=$(findfs "$KOPT_resume");;
-			*) resume_dev="$KOPT_resume";;
-			esac
-			printf "%d:%d" $(stat -Lc "0x%t 0x%T" "$resume_dev") >/sys/power/resume
-		else
-			echo "resume: no hibernation support found"
-		fi
-	fi
+	resume_from_disk
 
 	if [ "$KOPT_overlaytmpfs" = "yes" ]; then
 		# Create mountpoints
@@ -688,8 +742,27 @@ if [ -n "$KOPT_root" ]; then
 	fi
 
 	eend $?
+
+	if [ -r "$sysroot/etc/fstab" ] && [ "$KOPT_usrflags" != "disable" ]; then
+		while read dev mnt fs mntopts chk; do
+			if [ "$mnt" = "/usr" ]; then
+				ebegin "Mounting /usr"
+				$MOCK modprobe -a $fs 2> /dev/null
+				$MOCK nlplug-findfs \
+				      -p /sbin/mdev \
+				      ${KOPT_debug_init:+-d} \
+				      ${KOPT_uevent_buf_size:+-U $KOPT_uevent_buf_size} \
+				      $dev
+				$MOCK mount -t $fs \
+					-o ${KOPT_usrflags:-ro} \
+					$dev $sysroot/usr
+				eend $?
+			fi
+		done < $sysroot/etc/fstab
+	fi
+
 	cat "$ROOT"/proc/mounts 2>/dev/null | while read DEV DIR TYPE OPTS ; do
-		if [ "$DIR" != "/" -a "$DIR" != "$sysroot" -a -d "$DIR" ]; then
+		if [ "$DIR" != "/" -a "$DIR" != "$sysroot" -a "$DIR" != "$sysroot/usr" -a -d "$DIR" ]; then
 			mkdir -p $sysroot/$DIR
 			$MOCK mount -o move $DIR $sysroot/$DIR
 		fi
@@ -700,6 +773,8 @@ if [ -n "$KOPT_root" ]; then
 	exec /bin/busybox sh
 fi
 
+resume_from_disk
+
 if $do_networking; then
 	repoopts="-n"
 else
@@ -798,7 +873,7 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then
 	fi
 
 	if want_tiny_cloud; then
-		pkgs="$pkgs tiny-cloud-alpine ifupdown-ng doas"
+		pkgs="$pkgs tiny-cloud ifupdown-ng doas"
 		rc_add tiny-cloud-boot boot
 		rc_add tiny-cloud-early default
 		rc_add tiny-cloud-main default
@@ -948,7 +1023,7 @@ fi
 # fix inittab if alternative console
 setup_inittab_console
 
-#mympd build
+# mympd build
 echo "Adding myMPDos build service to firstboot"
 sed -i -e 's|eend $rc|/media/vda1/mympdos/build.sh\n\teend $rc|' "${sysroot}/etc/init.d/firstboot"
 

mympdos/netboot/init.patch

@@ -1,5 +1,3 @@
-950a951,954
-> #mympd build
-> echo "Adding myMPDos build service to firstboot"
-> sed -i -e 's|eend $rc|/media/vda1/mympdos/build.sh\n\teend $rc|' "${sysroot}/etc/init.d/firstboot"
-> 
+# mympd build
+echo "Adding myMPDos build service to firstboot"
+sed -i -e 's|eend $rc|/media/vda1/mympdos/build.sh\n\teend $rc|' "${sysroot}/etc/init.d/firstboot"

updates/1.5.4/update.sha256

@@ -0,0 +1,6 @@
+iBprdjeBQ0VLBDtnW/3bnHE/Y4zXm7vXVdStMpmuh95Fz3TNtFhObnsziNwlvZRq
+UkvtJMNXclXo9axVFw+FbmW5Zn/1POsmD+YRzTunCqe2Q8Nk2okA8GVIusbM198h
+YGERhKLOaTz+HtBEY3TUS5YbjsnT5oihiHYDbuh/AFLpTtIg8Pi3RGTUN4Awopmz
+Azc//p6bgpkttN2L+Z0Foksz3/msCUCV6x8agous8kLPqS1dLCWu9thJ6b3PnfZk
+8JpqeYbuXOX8i2VfYzlF2Aab+Pfae4J9G7EWs3N+s/fgiolyXdU8RO6YiBm3dBlz
+MiB+sg0qkU2rUFiw+ngVHw==

updates/1.5.4/update/myMPDos.version

@@ -0,0 +1 @@
+1.6.0

updates/1.5.4/update/update.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export V_MAJOR=3
+export V_MINOR=21
+export V_POINT=0
+export CHECKSUM=aa43adf1fff1d03c7a774d3962557a19d2300698a8e6fb6ce6e088cafbf4c710
+alpine-upgrade.sh