sync with archiso v68v68

ee4e4a9 Add changelog for 68
e0e4d20 configs/releng/airootfs/etc/mkinitcpio.conf: replace the deprecated archiso_kms hook with kms
2f9cfdf configs/: remove "Copy to RAM" boot entries since it is automatic now
1197161 mkarchiso: do not sign .sig files
f4f0a3a configs/: Do not explicitly enable qemu-guest-agent.service

Signed-off-by: David P. <megver83@parabola.nu>

11 files changed, 20 insertions, 44 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9ff12c3..52fe96f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,17 @@ Changed
 Removed
 -------
 
+[68] - 2022-10-30
+=================
+
+Changed
+-------
+
+- Do not explicitly enable ``qemu-guest-agent.service`` as it will be started by a udev rule.
+- Remove existing signature (``.sig``) files and do not sign them when signing netboot artifacts. This is mostly
+  applicable when re-running ``mkparabolaiso``  after a failure.
+- Replace ``parabolaiso_kms`` with ``kms`` in ``mkinitcpio.conf``. The hook is available in mkinitcpio since version 32.
+
 [67] - 2022-09-25
 =================
 
@@ -69,6 +80,8 @@ Removed
 
 - Remove the custom pacman hook that ran ``locale-gen`` on glibc install from the releng profile. The used locale now
   ships with the glibc package itself.
+- Remove "Copy to RAM" boot entries since the ``parabolaiso`` mkinitcpio hook enables it automatically when there is enough
+  free RAM.
 - Drop parabolaiso rEFInd support in favor of upstream archiso GRUB EFI bootmode.
 
 [64] - 2022-05-30
diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
deleted file mode 120000
index 8e3ff80..0000000
--- a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/qemu-guest-agent.service
\ No newline at end of file
diff --git a/configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf b/configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf
deleted file mode 100644
index 630af00..0000000
--- a/configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title   Parabola GNU/Linux-libre (x86_64, UEFI) Copy to RAM
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg
index ddcfa41..50300d3 100644
--- a/configs/baseline/grub/grub.cfg
+++ b/configs/baseline/grub/grub.cfg
@@ -33,10 +33,3 @@ menuentry "Parabola GNU/Linux-libre (x86_64, UEFI)" --class arch --class gnu-lin
     linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 }
-
-menuentry "Parabola GNU/Linux-libre (x86_64, UEFI) Copy to RAM" --class arch --class gnu-linux --class gnu --class os --id 'parabola-copy-to-ram' {
-    set gfxpayload=keep
-    search --no-floppy --set=root --label %PARABOLAISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
-    initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-}
diff --git a/configs/baseline/syslinux/syslinux-linux-libre.cfg b/configs/baseline/syslinux/syslinux-linux-libre.cfg
index 47ac1e7..6d4c9f8 100644
--- a/configs/baseline/syslinux/syslinux-linux-libre.cfg
+++ b/configs/baseline/syslinux/syslinux-linux-libre.cfg
@@ -3,9 +3,3 @@ MENU LABEL Parabola GNU/Linux-libre (x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-libre
 INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
-
-LABEL parabola-ram
-MENU LABEL Parabola GNU/Linux-libre (x86_64, BIOS) Copy to RAM
-LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-libre.img
-APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf
index f1d34eb..01fa93a 100644
--- a/configs/releng/airootfs/etc/mkinitcpio.conf
+++ b/configs/releng/airootfs/etc/mkinitcpio.conf
@@ -49,7 +49,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev modconf memdisk parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard)
+HOOKS=(base udev modconf kms memdisk parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs block filesystems keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
deleted file mode 120000
index 8e3ff80..0000000
--- a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/qemu-guest-agent.service
\ No newline at end of file
diff --git a/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
deleted file mode 100644
index ea54bc3..0000000
--- a/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title    Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM)
-sort-key 03
-linux    /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-options  parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/configs/releng/efiboot/loader/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf b/configs/releng/efiboot/loader/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
deleted file mode 100644
index 9a5b99b..0000000
--- a/configs/releng/efiboot/loader/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title    Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM) with speech
-sort-key 04
-linux    /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-options  parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram accessibility=on
diff --git a/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg
index cbf736e..9bdb4a8 100644
--- a/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg
+++ b/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg
@@ -18,14 +18,3 @@ MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS) with ^speech
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
 INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on
-
-# Copy to RAM boot option
-LABEL parabola64ram
-TEXT HELP
-Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option
-It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
-ENDTEXT
-MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS, Copy to RAM)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index a2f27b4..26fa82d 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -372,7 +372,7 @@ _make_packages() {
                         -r -- /proc/sys/fs/binfmt_misc 2> /dev/null \
                         | xargs -r grep -xF 'enabled') ]]; then
             # Register the qemu-arm-static as an ARM interpreter in the kernel (using binfmt_misc kernel module)
-            echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register
+            printf ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register
         fi
         install -d -m 0755 -- "${pacstrap_dir}/usr/bin"
         install -m 0755 -- /usr/bin/qemu-arm-static "${pacstrap_dir}/usr/bin"
@@ -413,7 +413,9 @@ _make_packages() {
     fi
 
     # Delete the qemu-arm-static binary
-    rm -f -- "${pacstrap_dir}/usr/bin/qemu-arm-static"
+    if [[ "${arch}" == "armv7h" ]] && ! setarch armv7l /bin/true 2>/dev/null; then
+        rm -f -- "${pacstrap_dir}/usr/bin/qemu-arm-static"
+    fi
 
     _msg_info "Done! Packages installed successfully."
 }
@@ -1085,7 +1087,8 @@ _sign_netboot_artifacts() {
     local _files_to_sign=()
     _msg_info "Signing netboot artifacts..."
     _dir="${isofs_dir}/${install_dir}/boot/"
-    for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"* "${_dir}${arch}/initramfs-"*.img; do
+    for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"!(*.sig) "${_dir}${arch}/initramfs-"*.img; do
+        rm -f -- "${_file}".ipxe.sig
         openssl cms \
             -sign \
             -binary \