diff options
| author | Erich Eckner <git@eckner.net> | 2020-09-10 14:53:21 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-02-13 14:06:33 +0100 |
| commit | f9e251ba0f71a5805923ff2f4cbb2a3e1a14a32e (patch) | |
| tree | a697323f71e72823518159aa9e49d56356e1bbba | |
| parent | 0c4898b50a5091b66ec87b27b2430dc75e1f3d39 (diff) | |
| download | devtools-f9e251ba0f71a5805923ff2f4cbb2a3e1a14a32e.tar.xz | |
archbuild: allow empty setarch to skip running setarch at all
| -rw-r--r-- | archbuild.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archbuild.in b/archbuild.in index 73796ba..80d149a 100644 --- a/archbuild.in +++ b/archbuild.in @@ -22,6 +22,7 @@ else fi if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${arch}" + [ -z "${set_arch}" ] && unset set_arch else set_arch="${arch}" fi @@ -99,7 +100,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" (umask 0022; mkdir -p "${chroots}/${repo}-${arch}") - setarch "${set_arch}" mkarchroot \ + ${set_arch:+setarch "${set_arch}"} mkarchroot \ -C "${pacman_config}" \ -M "${makepkg_config}" \ ${cache_dir} \ |