diff options
| author | Erich Eckner <git@eckner.net> | 2020-01-09 00:10:22 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-01-09 00:10:22 +0100 |
| commit | 532db85c5848e8953fcbdd0cf8965f0ee615af10 (patch) | |
| tree | b7af03bb322a173111b0b0a2b28a1a636105a801 | |
| parent | 0ebd510b5b256a6137ed8a330ec02437f29879db (diff) | |
| download | archiso32-532db85c5848e8953fcbdd0cf8965f0ee615af10.tar.xz | |
configs/releng/build.sh: pin architecture in per-arch pacman.confs
| -rwxr-xr-x | configs/releng/build.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0c68066..727edd4 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -52,7 +52,7 @@ run_once() { fi } -# Setup custom pacman.conf with current cache directories and custom mirrorlist. +# Setup custom pacman.conf with current cache directories and custom mirrorlist and custom architecture. make_pacman_conf() { local _cache_dirs _cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) @@ -61,6 +61,14 @@ make_pacman_conf() { s@/var/cache/pacman/pkg/@/var/cache/archbuild32/@ s@Include = /etc/pacman\.d/mirrorlist$@\032@ ' ${work_dir}/pacman-x86_64.conf > ${work_dir}/pacman-i686.conf + local _conf + for _conf in ${work_dir}/pacman-*.conf; do + sed -i ' + /^Architecture =/ s/=.*$/= '"${_conf##*/pacman-}"'/ + T + s/\.conf$// + ' "$_conf" + done } # Base installation, plus needed packages (airootfs) |