Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archbuild.in
diff options
context:
space:
mode:
Diffstat (limited to 'archbuild.in')
-rw-r--r--archbuild.in17
1 files changed, 13 insertions, 4 deletions
diff --git a/archbuild.in b/archbuild.in
index 163a108..4ddc097 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -20,6 +20,15 @@ fi
chroots='/var/lib/archbuild'
clean_first=false
+pacman_config=@pkgdatadir@/pacman-${repo}.conf
+if [[ -f ${pacman_config%.conf}-${arch}.conf ]]; then
+ pacman_config=${pacman_config%.conf}-${arch}.conf
+fi
+makepkg_config=@pkgdatadir@/makepkg-${arch}.conf
+if [[ -f ${makepkg_config%-${arch}.conf}-${repo}-${arch}.conf ]]; then
+ makepkg_config=${makepkg_config%-${arch}.conf}-${repo}-${arch}.conf
+fi
+
usage() {
echo "Usage: $cmd [options] -- [makechrootpkg args]"
echo ' -h This help'
@@ -61,15 +70,15 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
mkdir -p "${chroots}/${repo}-${arch}"
setarch "${arch}" mkarchroot \
- -C "@pkgdatadir@/pacman-${repo}.conf" \
- -M "@pkgdatadir@/makepkg-${arch}.conf" \
+ -C "${pacman_config}" \
+ -M "${makepkg_config}" \
"${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" || abort
else
lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot"
arch-nspawn \
- -C "@pkgdatadir@/pacman-${repo}.conf" \
- -M "@pkgdatadir@/makepkg-${arch}.conf" \
+ -C "${pacman_config}" \
+ -M "${makepkg_config}" \
"${chroots}/${repo}-${arch}/root" \
pacman -Syu --noconfirm || abort
fi