diff options
| author | Erich Eckner <git@eckner.net> | 2020-09-10 14:53:21 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-02-25 12:40:39 +0100 |
| commit | ff30ab3a24b5a2634af658682e0d0fc4b8c8ea10 (patch) | |
| tree | 84d96168b2faa6ead12712e4c1fb2e3a605818ab | |
| parent | 81a2d94c4f040d54337aa31b700a1a8ed9c4f822 (diff) | |
| download | devtools-ff30ab3a24b5a2634af658682e0d0fc4b8c8ea10.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} \ |