Merge pull request #1222 from kernelkit/xpi-boot-time

troglobit · web-flow · commit 4b3ee0fa5ea8 · 2025-11-02T08:33:00.000+01:00
diff --git a/board/aarch64/bananapi-bpi-r3/genimage.cfg.in b/board/aarch64/bananapi-bpi-r3/genimage.cfg.in
@@ -4,16 +4,23 @@ image cfg.ext4 {
         size = 128M
         ext4 {
                 label = "cfg"
+                use-mke2fs = true
+                features = "uninit_bg"
+                extraargs = "-m 0 -i 4096"
         }
 }
 
+# The /var partition will be expanded automatically at first boot
+# to use the full size of the SD-card or eMMC media.
 image var.ext4 {
         empty = true
         temporary = true
-        size = 1G
+        size = 128M
         ext4 {
                 label = "var"
                 use-mke2fs = true
+                features = "uninit_bg"
+                extraargs = "-m 0 -i 4096"
         }
 }
 
diff --git a/board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in b/board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in
@@ -5,17 +5,24 @@ image cfg.ext4 {
 
 	ext4 {
 		label = "cfg"
+                use-mke2fs = true
+                features = "uninit_bg"
+                extraargs = "-m 0 -i 4096"
 	}
 }
 
+# The /var partition will be expanded automatically at first boot
+# to use the full size of the SD-card or eMMC media.
 image var.ext4 {
 	empty = true
 	temporary = true
-	size = 512M
+	size = 128M
 
 	ext4 {
 		label = "var"
-		use-mke2fs = true
+                use-mke2fs = true
+                features = "uninit_bg"
+                extraargs = "-m 0 -i 4096"
 	}
 }
 
diff --git a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in
@@ -15,17 +15,24 @@ image cfg.ext4 {
 
 	ext4 {
 		label = "cfg"
+                use-mke2fs = true
+                features = "uninit_bg"
+                extraargs = "-m 0 -i 4096"
 	}
 }
 
+# The /var partition will be expanded automatically at first boot
+# to use the full size of the SD-card or eMMC media.
 image var.ext4 {
 	empty = true
 	temporary = true
-	size = 512M
+	size = 128M
 
 	ext4 {
 		label = "var"
-		use-mke2fs = true
+                use-mke2fs = true
+                features = "uninit_bg"
+                extraargs = "-m 0 -i 4096"
 	}
 }
 
diff --git a/board/common/mkaux.sh b/board/common/mkaux.sh
@@ -11,7 +11,8 @@ image aux.ext4 {
 	ext4 {
 		label = "aux"
 		use-mke2fs = true
-		features = "^metadata_csum,^metadata_csum_seed"
+		features = "^metadata_csum,^metadata_csum_seed,uninit_bg"
+                extraargs = "-m 0 -i 4096"
 	}
 }
 
diff --git a/board/common/rootfs/etc/fstab b/board/common/rootfs/etc/fstab
@@ -15,9 +15,9 @@ cfgfs		/config		configfs	nofail,noauto		0	0
 # The chosen backing storage for the overlays placed on /cfg, /etc,
 # /home, /root, and /var, are determined dynamically by /usr/libexec/infix/mnt
 # depending on the available devices.
-mnttmp		/mnt/tmp	tmpfs		defaults			0	0
-LABEL=aux	/mnt/aux	auto		noatime,nodiratime,noauto	0	0
-LABEL=var	/mnt/var	auto		noatime,nodiratime,noauto	0	0
-LABEL=cfg	/mnt/cfg	auto		noatime,nodiratime,noauto	0	0
-hostfs		/mnt/host	9p		cache=none,msize=16384,noauto	0	0
-/usr/libexec/infix/mnt#	/cfg	helper		none				0	0
+mnttmp		/mnt/tmp	tmpfs	defaults				0	0
+LABEL=aux	/mnt/aux	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+LABEL=var	/mnt/var	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+LABEL=cfg	/mnt/cfg	auto	noatime,nodiratime,noauto,commit=30,errors=remount-ro	0 0
+hostfs		/mnt/host	9p	cache=none,msize=16384,noauto		0	0
+/usr/libexec/infix/mnt#	/cfg	helper	none					0	0
diff --git a/board/common/rootfs/usr/libexec/infix/mnt b/board/common/rootfs/usr/libexec/infix/mnt
@@ -19,6 +19,7 @@ set -e
 
 nm=$(basename "$0")
 err=0
+mmc=""
 opt="-k"
 
 # External button or bootloader changed kernel command line
@@ -53,17 +54,22 @@ factory_reset()
 
 is_mmc()
 {
+    [ -n "$mmc" ] && return $mmc
+
     # Check if primary or secondary partition (our rootfs) is on MMC
     for label in primary secondary; do
         devname=$(find_partition_by_label "$label" 2>/dev/null)
         if [ -n "$devname" ]; then
             case "$devname" in
                 mmcblk*)
+		    mmc=0
                     return 0
                     ;;
             esac
         fi
     done
+
+    mmc=1
     return 1
 }
 
@@ -89,8 +95,15 @@ find_partition_by_label()
 
     for diskpath in /sys/class/block/*; do
 	devname=$(basename "$diskpath")
+
+	# Skip partitions, only check whole disks
 	[ -f "$diskpath/partition" ] && continue
 
+	# Skip ram, loop, and other virtual devices
+	case "$devname" in
+	    ram*|loop*|nullb*|dm-*) continue ;;
+	esac
+
 	disk="/dev/$devname"
 	result=$(sgdisk -p "$disk" 2>/dev/null | awk -v label="$label" -v devname="$devname" '
 	    /^  *[0-9]/ {
@@ -133,7 +146,7 @@ status()
 
 print_start()
 {
-    printf '\r%s%s' "$(status 3)" "$*" > /dev/console
+    printf '\r\033[K%s%s' "$(status 3)" "$*" > /dev/console
 }
 
 print_end()
@@ -146,6 +159,12 @@ print_end()
     fi
 }
 
+# Restore Finit's original progress message so its [ OK ] appears correctly
+print_restore()
+{
+    print_start "Mounting filesystems from /etc/fstab"
+}
+
 # Helper to log resize error and create failure marker (stage 1)
 resize_err()
 {
@@ -245,9 +264,7 @@ resize_filesystem()
     mv /mnt/aux/resized.pending /mnt/aux/resized
     sync
 
-    # Restore Finit's original progress message so its [ OK ] appears correctly
-    print_start "Mounting filesystems from /etc/fstab"
-
+    print_restore
     return 0
 }
 
@@ -259,15 +276,21 @@ mount_rw()
     # Check if /var has been resized to fill the sdcard/eMMC
     if [ "$1" = "var" ] && is_mmc; then
 	if [ -f /mnt/aux/resized ] || [ -f /mnt/aux/resized.failed ]; then
+	    # 3. Already done
 	    :
 	elif [ -f /mnt/aux/resized.pending ]; then
+	    # 2. After reboot we can resize ext4
 	    resize_filesystem "$1"
 	else
+	    # 1. Start with resizing the var partition to the end of the media
 	    resize_partition "$1"
 	fi
     fi
 
     # TODO: Also look for UBI partitions
+
+    # 
+    tune2fs -c 0 -i 0 LABEL="$1" 2>/dev/null 
     mount LABEL="$1" 2>/dev/null && return 0
 
     return 1
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
@@ -124,6 +124,7 @@ BR2_PACKAGE_MG=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 # BR2_TARGET_ROOTFS_TAR is not set
+BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig
@@ -100,6 +100,7 @@ BR2_PACKAGE_MG=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 # BR2_TARGET_ROOTFS_TAR is not set
+BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
@@ -114,8 +115,11 @@ INFIX_HOME="https://github.com/kernelkit/infix/"
 INFIX_DOC="https://kernelkit.org/infix/"
 INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_ALDER_ALDER=y
+BR2_PACKAGE_BANANAPI_BPI_R3=y
+BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S=y
 BR2_PACKAGE_MARVELL_CN9130_CRB=y
 BR2_PACKAGE_MARVELL_ESPRESSOBIN=y
+BR2_PACKAGE_RASPBERRYPI_RPI64=y
 BR2_PACKAGE_STYX_DCP_SC_28P=y
 BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig
@@ -164,6 +164,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out"
 BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_INFIX_PATH)/board/riscv64/visionfive2/uboot/visionfive2-env.dtsi"
+BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -3,6 +3,25 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v25.11.0][UNRELEASED]
+-------------------------
+
+### Changes
+
+- Improvements to `sdcard.img` generation, useful for developers mostly:
+   - The NanoPi R2S bootloader is now automatically built and uploaded to
+     the [`latest-boot` release][lastest-boot] tag
+   - The `utils/mkimage.sh` script now supports fetching the bootloader
+   - The raspberrypi-rpi64 board's bootloader is now aptly named rpi64
+
+### Fixes
+
+- Fix #855: User admin sometimes fails to be added to `wheel` group
+- Fix serious regression in boot time, introduced in v25.10, delays the
+  boot step "Mounting filesystems ..." with up to 30 seconds!
+
+[lastest-boot]: https://github.com/kernelkit/infix/releases/latest-boot
+
 [v25.10.0][] - 2025-10-31
 -------------------------
 
@@ -1725,7 +1744,8 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
  - N/A
 
 [buildroot]:  https://buildroot.org/
-[UNRELEASED]: https://github.com/kernelkit/infix/compare/v25.09.0...HEAD
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v25.10.0...HEAD
+[v25.11.0]:   https://github.com/kernelkit/infix/compare/v25.10.0...v26.11.0
 [v25.10.0]:   https://github.com/kernelkit/infix/compare/v25.09.0...v26.10.0
 [v25.09.0]:   https://github.com/kernelkit/infix/compare/v25.08.0...v26.09.0
 [v25.08.0]:   https://github.com/kernelkit/infix/compare/v25.06.1...v26.08.0
diff --git a/utils/mkimage.sh b/utils/mkimage.sh

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,23 @@ image cfg.ext4 {`
`4`	`4`	`size = 128M`
`5`	`5`	`ext4 {`
`6`	`6`	`label = "cfg"`
	`7`	`+ use-mke2fs = true`
	`8`	`+ features = "uninit_bg"`
	`9`	`+ extraargs = "-m 0 -i 4096"`
`7`	`10`	`}`
`8`	`11`	`}`
`9`	`12`
	`13`	`+# The /var partition will be expanded automatically at first boot`
	`14`	`+# to use the full size of the SD-card or eMMC media.`
`10`	`15`	`image var.ext4 {`
`11`	`16`	`empty = true`
`12`	`17`	`temporary = true`
`13`		`- size = 1G`
	`18`	`+ size = 128M`
`14`	`19`	`ext4 {`
`15`	`20`	`label = "var"`
`16`	`21`	`use-mke2fs = true`
	`22`	`+ features = "uninit_bg"`
	`23`	`+ extraargs = "-m 0 -i 4096"`
`17`	`24`	`}`
`18`	`25`	`}`
`19`	`26`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,24 @@ image cfg.ext4 {`
`5`	`5`
`6`	`6`	`ext4 {`
`7`	`7`	`label = "cfg"`
	`8`	`+ use-mke2fs = true`
	`9`	`+ features = "uninit_bg"`
	`10`	`+ extraargs = "-m 0 -i 4096"`
`8`	`11`	`}`
`9`	`12`	`}`
`10`	`13`
	`14`	`+# The /var partition will be expanded automatically at first boot`
	`15`	`+# to use the full size of the SD-card or eMMC media.`
`11`	`16`	`image var.ext4 {`
`12`	`17`	`empty = true`
`13`	`18`	`temporary = true`
`14`		`- size = 512M`
	`19`	`+ size = 128M`
`15`	`20`
`16`	`21`	`ext4 {`
`17`	`22`	`label = "var"`
`18`		`- use-mke2fs = true`
	`23`	`+ use-mke2fs = true`
	`24`	`+ features = "uninit_bg"`
	`25`	`+ extraargs = "-m 0 -i 4096"`
`19`	`26`	`}`
`20`	`27`	`}`
`21`	`28`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,24 @@ image cfg.ext4 {`
`15`	`15`
`16`	`16`	`ext4 {`
`17`	`17`	`label = "cfg"`
	`18`	`+ use-mke2fs = true`
	`19`	`+ features = "uninit_bg"`
	`20`	`+ extraargs = "-m 0 -i 4096"`
`18`	`21`	`}`
`19`	`22`	`}`
`20`	`23`
	`24`	`+# The /var partition will be expanded automatically at first boot`
	`25`	`+# to use the full size of the SD-card or eMMC media.`
`21`	`26`	`image var.ext4 {`
`22`	`27`	`empty = true`
`23`	`28`	`temporary = true`
`24`		`- size = 512M`
	`29`	`+ size = 128M`
`25`	`30`
`26`	`31`	`ext4 {`
`27`	`32`	`label = "var"`
`28`		`- use-mke2fs = true`
	`33`	`+ use-mke2fs = true`
	`34`	`+ features = "uninit_bg"`
	`35`	`+ extraargs = "-m 0 -i 4096"`
`29`	`36`	`}`
`30`	`37`	`}`
`31`	`38`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ image aux.ext4 {`
`11`	`11`	`ext4 {`
`12`	`12`	`label = "aux"`
`13`	`13`	`use-mke2fs = true`
`14`		`- features = "^metadata_csum,^metadata_csum_seed"`
	`14`	`+ features = "^metadata_csum,^metadata_csum_seed,uninit_bg"`
	`15`	`+ extraargs = "-m 0 -i 4096"`
`15`	`16`	`}`
`16`	`17`	`}`
`17`	`18`