mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-07-12 18:19:42 -07:00
init: fix LABEL=ARCHR boot failure + bump RTL8188EUS to current HEAD
The "Unable to find LABEL=ARCHR, powering off" wall on the freshly flashed image traced back to a latent bug in the initramfs busybox packaging that the boot.ini LABEL= migration (issue #34) made deterministic. busybox/package.mk The mount, umount and findfs applets are compiled into the init busybox (CONFIG_MOUNT/UMOUNT/FINDFS in config/busybox-init.conf), but no symlinks were ever installed for them. mount_common() in the init script calls `mount LABEL=... /flash` and `findfs LABEL=...` by bare name; without symlinks the shell can't find either command and the 15 retry loops silently exhaust to the power-off message. This bug also affected the previous /dev/mmcblk${devnum}p1 path: the string was never reaching the syscall through busybox. Adds: ln -sf /usr/bin/busybox ${INSTALL}/usr/bin/mount ln -sf /usr/bin/busybox ${INSTALL}/usr/bin/umount ln -sf /usr/bin/busybox ${INSTALL}/usr/sbin/findfs /usr/sbin/blkid is already shipped by util-linux as a real binary, no symlink needed for it. busybox/scripts/init Exports PATH=/usr/sbin:/usr/bin:/sbin:/bin at the top so the bare blkid/findfs/mount calls in mount_common() resolve against /usr/sbin/blkid (util-linux real binary) and the new busybox symlinks. Without this, the busybox sh default PATH on aarch64 built images is too narrow to find /usr/sbin tools. RTL8188EUS/package.mk PKG_VERSION bumped from ec90af2b... (no longer on the remote) to af3bf004458f76b7aec33e9ba552cd382ed1f5c3, the current HEAD of the default v5.3.9 branch on aircrack-ng/rtl8188eus. The previous SHA failed at `get` time: `fatal: remote error: upload-pack: not our ref ec90af2b...`, blocking the whole image build.
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2026-present ArchR (https://github.com/archr-linux/Arch-R)
|
||||
|
||||
PKG_NAME="RTL8188EUS"
|
||||
PKG_VERSION="ec90af2b3f2f7d2956c7c25d0bbeb536e9ed5f9d"
|
||||
PKG_VERSION="af3bf004458f76b7aec33e9ba552cd382ed1f5c3"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/aircrack-ng/rtl8188eus"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
|
||||
@@ -210,6 +210,17 @@ makeinstall_init() {
|
||||
|
||||
mkdir -p ${INSTALL}/usr/sbin
|
||||
ln -sf /usr/bin/busybox ${INSTALL}/usr/sbin/blockdev
|
||||
# The init script in scripts/init calls `mount`, `umount`, and
|
||||
# `findfs` by bare name (not `busybox mount`). All three applets
|
||||
# are compiled into the init busybox (CONFIG_MOUNT/UMOUNT/FINDFS
|
||||
# in config/busybox-init.conf), but without symlinks they cannot
|
||||
# be invoked at all: mount_common() and findfs-based resolution
|
||||
# silently fail every loop iteration and the user sees
|
||||
# "Unable to find LABEL=..., powering off" after 15s of retries.
|
||||
# This is what bit issue #34's LABEL= boot.ini change.
|
||||
ln -sf /usr/bin/busybox ${INSTALL}/usr/bin/mount
|
||||
ln -sf /usr/bin/busybox ${INSTALL}/usr/bin/umount
|
||||
ln -sf /usr/bin/busybox ${INSTALL}/usr/sbin/findfs
|
||||
|
||||
mkdir -p ${INSTALL}/etc
|
||||
touch ${INSTALL}/etc/fstab
|
||||
|
||||
@@ -8,6 +8,12 @@
|
||||
# Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
|
||||
# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
|
||||
|
||||
# Explicit PATH so the bare-name `mount`, `umount`, `findfs`, `blkid`
|
||||
# calls in mount_common() always resolve. /usr/sbin is where util-linux
|
||||
# blkid lives; /usr/bin is where the busybox-applet symlinks for the
|
||||
# other three live (see makeinstall_init in busybox/package.mk).
|
||||
export PATH=/usr/sbin:/usr/bin:/sbin:/bin
|
||||
|
||||
# create directories
|
||||
/usr/bin/busybox mkdir -p /dev
|
||||
/usr/bin/busybox mkdir -p /proc
|
||||
|
||||
Reference in New Issue
Block a user