diff options
Diffstat (limited to 'source/installer')
-rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 6b40c72d4..beef8ea07 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Wed May 8 09:26:31 UTC 2024 + build_installer.sh: Switch to the 'pciutils' implementation of 'lspci' since + Busybox's implementation lacks the capability to map hardware IDs to model + names; a feature we rely on for the conditional loading of Kernel modules on + AArch64. + gzip the content of /usr/share/hwdata to conserve space. ++--------------------------+ Mon Mar 18 08:08:08 UTC 2024 Added console font 'ter-v18n' to accommodate the Raspberry Pi 400's screen. Thanks to BrianL. diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 6cf9cf664..a70c9c1d6 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1429,6 +1429,7 @@ cd $TMP/extract-packages/usr/share/hwdata mkdir -p -m755 $PKG/$ARCH-installer-filesystem/usr/share/hwdata cp -fa${VERBOSE1} pci.ids usb.ids \ $PKG/$ARCH-installer-filesystem/usr/share/hwdata +gzip -9${VERBOSE1} $PKG/$ARCH-installer-filesystem/usr/share/hwdata/* # Copy the rc script for rpcbind: cd $TMP/extract-packages/etc/rc.d @@ -1456,14 +1457,19 @@ for prunedir in $PKG/$ARCH-installer-filesystem/usr/bin $PKG/$ARCH-installer-fil rm -f $PKG/$ARCH-installer-filesystem/sbin/$(basename $removefile) done done -if [ -r $PKG/$ARCH-installer-filesystem/sbin/lspci -a ! -L $PKG/$ARCH-installer-filesystem/sbin/lspci -a -L $PKG/$ARCH-installer-filesystem/bin/lspci ]; then - rm -f $PKG/$ARCH-installer-filesystem/bin/lspci -fi + # busybox's implementation of 'xzcat' provides different output when piped into 'dd'. # Symlink 'xzcat' to the real 'xz' as we do within the OS: cd $PKG/$ARCH-installer-filesystem/bin ln -fs xz xzcat +# Busybox's implementation of 'lspci' doesn't consult the hardware data within +# /usr/share/hwdata. Replace it with pciutils' version: +cp --remove-destination \ + -fa${VERBOSE1} \ + $TMP/extract-packages/usr/bin/lspci \ + $PKG/$ARCH-installer-filesystem/bin/ + # Update to latest versions of files within /etc/ # /etc/ file Package Reason # ------------------------------------------------------------------------------------ |