sync with archiso v56v56

Arch changes:
3eef5be (tag: v56) Merge branch 'changelog/56'
9e6b0d3 (origin/changelog/56) Add changelog for v56
7d12031 Merge branch 'issues/132'
97b7aeb (origin/issues/132) gitlab-ci: Also build a baseline netboot target
19861e4 archiso/mkarchiso: Generalize handling of ucodes
33e4ff6 Merge remote-tracking branch 'grazzolini/parallel_downloads'
d75689b baseline/pacman.conf: Enable parallel downloads
5343f5f releng/pacman.conf: Enable parallel downloads
e264914 Merge remote-tracking branch 'nl6720/env-i-SOURCE_DATE_EPOCH'
cbac95e mkarchiso: pass SOURCE_DATE_EPOCH to chroot
9c44aee Merge remote-tracking branch 'nl6720/update-wiki-url'
6e1ca35 Update ArchWiki article URLs
8a01a6c Merge remote-tracking branch 'sxw/issue25'
bcdfe90 Add documentation for the `script=` variable
d1a93e3 Merge remote-tracking branch 'nl6720/pacman6'
6f671e1 configs/*/pacman.conf: update configuration file for pacman 6
960b988 Merge remote-tracking branch 'nl6720/ARCHISO_GNUPG_FD-unbound-variable'
62e74c7 mkarchiso: fix unbound variable when not using GPG signing
a9a4dc4 Merge remote-tracking branch 'nl6720/env-i'
3d6651a archiso/mkarchiso: clear environment variables when chrooting

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

1 files changed, 9 insertions, 7 deletions

diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 0fa0f04..1504364 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -349,6 +349,7 @@ _make_custom_airootfs() {
 
 # Install desired packages to airootfs
 _make_packages() {
+    local envvars_in_chroot=("SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}")
     _msg_info "Installing packages to '${pacstrap_dir}/'..."
 
     local buildmode_pkg_list_arch
@@ -356,13 +357,13 @@ _make_packages() {
 
     if [[ -n "${gpg_key}" ]]; then
         exec {PARABOLAISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
-        export PARABOLAISO_GNUPG_FD
+        envvars_in_chroot+=("PARABOLAISO_GNUPG_FD=${PARABOLAISO_GNUPG_FD}")
     fi
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${work_dir}/${buildmode}.pacman.conf.${arch}" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" "${buildmode_pkg_list_arch[@]}" &> /dev/null
+        env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf.${arch}" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" "${buildmode_pkg_list_arch[@]}" &> /dev/null
     else
-        pacstrap -C "${work_dir}/${buildmode}.pacman.conf.${arch}" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" "${buildmode_pkg_list_arch[@]}"
+        env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf.${arch}" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" "${buildmode_pkg_list_arch[@]}"
     fi
 
     if [[ -n "${gpg_key}" ]]; then
@@ -404,7 +405,7 @@ _make_customize_airootfs() {
         _msg_info "Running customize_airootfs.sh in '${pacstrap_dir}' chroot..."
         _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version."
         chmod -f -- +x "${pacstrap_dir}/root/customize_airootfs.sh"
-        eval -- arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+        eval -- env -i "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}" arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
         rm -- "${pacstrap_dir}/root/customize_airootfs.sh"
         _msg_info "Done! customize_airootfs.sh run successfully."
     fi
@@ -806,9 +807,10 @@ _export_netboot_artifacts() {
 # sign build artifacts for netboot
 _sign_netboot_artifacts() {
     local _file _dir
+    local _files_to_sign=()
     _msg_info "Signing netboot artifacts..."
-    _dir="${isofs_dir}/${install_dir}/"
-    for _file in "${_dir}/boot/${arch}/vmlinuz-"* "${_dir}/boot/${arch}/initramfs-"*.img; do
+    _dir="${isofs_dir}/${install_dir}/boot/"
+    for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"* "${_dir}${arch}/initramfs-"*.img; do
         openssl cms \
             -sign \
             -binary \
@@ -902,7 +904,7 @@ _add_xorrisofs_options_bios.syslinux.mbr() {
         # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
         # bootstrap code area) and mark it as bootable
         # May allow booting on some systems
-        # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
+        # https://wiki.archlinux.org/title/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
         '--mbr-force-bootable'
         # Move the first partition away from the start of the ISO to match the expectations of partition editors
         # May allow booting on some systems