Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-01-22 13:16:10 +0200
committernl6720 <nl6720@gmail.com>2022-01-22 13:16:10 +0200
commitf8225782e27e581a97d807a9d152b94771ee559a (patch)
treec6f260a92f5a8e2b5584555bc57e762962e92f61
parente2e4f3d6196fd013d944390f793f12e8dad089c3 (diff)
parent742619240c9f534123e8205eef8dca1a20c7d439 (diff)
Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git
By weltio weltio move $arch override to before it is used closes https://gitlab.archlinux.org/archlinux/archiso/-/issues/163 * initial: arch="" * _read_profile: packages="${profile}/packages.${arch}" * _set_overrides: [[ -n "$arch" ]] || arch="$(uname -m)" $arch is not defined in _read_profile if arch is not defined in profiledef.sh and packages is not updated after _set_overrides [[ -n "$arch" ]] || arch="$(uname -m)" should be moved from _set_overrides to _read_profile.
-rwxr-xr-xarchiso/mkarchiso2
1 files changed, 1 insertions, 1 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index dab6bde..f6b3395 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1048,6 +1048,7 @@ _read_profile() {
. "${profile}/profiledef.sh"
# Resolve paths of files that are expected to reside in the profile's directory
+ [[ -n "$arch" ]] || arch="$(uname -m)"
[[ -n "$packages" ]] || packages="${profile}/packages.${arch}"
packages="$(realpath -- "${packages}")"
pacman_conf="$(realpath -- "${pacman_conf}")"
@@ -1155,7 +1156,6 @@ _set_overrides() {
fi
# Set variables that do not have overrides
- [[ -n "$arch" ]] || arch="$(uname -m)"
[[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
[[ -n "$iso_name" ]] || iso_name="${app_name}"
}