summaryrefslogtreecommitdiff
path: root/parabolaiso/mkparabolaiso
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-07-06 19:39:53 -0400
committerDavid P <megver83@parabola.nu>2021-07-06 19:39:53 -0400
commit384ba1e959767d7cf1deeb2e127e3cd1158948ff (patch)
tree048c836f889407e6f72d9276feca21bde480a24f /parabolaiso/mkparabolaiso
parentb121012e2bfb1471ce42db7a078f66a28219a4f1 (diff)
sync with archiso
Arch changes: 1b01d22 (HEAD -> master, origin/master, origin/HEAD) Merge remote-tracking branch 'nl6720/env-i-PATH' d65682a mkarchiso: unset TMPDIR to work around FS#70580 c4d1109 Revert "archiso/mkarchiso: clear environment variables when chrooting" 33a2ab6 Merge branch 'issues/140' f48e9cd (origin/issues/140) Remove build-host.sh d56cbd9 gitlab-ci: Include from ci-scripts e0514b1 ci: Provide artifacts in top-level output dir a44310b Rename build script Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso/mkparabolaiso')
-rwxr-xr-xparabolaiso/mkparabolaiso10
1 files changed, 5 insertions, 5 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 1504364..61cab7f 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -349,7 +349,6 @@ _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
@@ -357,13 +356,14 @@ _make_packages() {
if [[ -n "${gpg_key}" ]]; then
exec {PARABOLAISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
- envvars_in_chroot+=("PARABOLAISO_GNUPG_FD=${PARABOLAISO_GNUPG_FD}")
+ export PARABOLAISO_GNUPG_FD
fi
+ # Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
if [[ "${quiet}" = "y" ]]; then
- 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
+ env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf.${arch}" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" "${buildmode_pkg_list_arch[@]}" &> /dev/null
else
- 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[@]}"
+ env -u TMPDIR 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
@@ -405,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 -- env -i "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}" arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+ eval -- env -u TMPDIR arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
rm -- "${pacstrap_dir}/root/customize_airootfs.sh"
_msg_info "Done! customize_airootfs.sh run successfully."
fi