diff options
| author | Erich Eckner <git@eckner.net> | 2020-04-09 21:27:11 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-06-29 10:43:33 +0200 |
| commit | 307f8ddb2c0ddab33ceaa0900d324cc011114662 (patch) | |
| tree | a372e65911a2b1ef7ce5815680f9d9b3241f3897 /archbuild.in | |
| parent | a347c0358bb7c9962750602ebe0b7311ee66fb4e (diff) | |
| download | devtools32-307f8ddb2c0ddab33ceaa0900d324cc011114662.tar.xz | |
allow to call setarch with a different value than $CARCH
Introduce setarch-aliases.d/ which gets installed inside
/usr/share/devtools. This allows to assign aliases which map one CARCH
to a different name which gets provided as argument for setarch. This is
necessary on archlinuxarm ("armv6h" -> "armv6l", "armv7h" -> "armv7l")
and allows for more fine-grained architectures (e.g. archlinux32 has
"i686" and "pentium4", which differ in the required cpu capabilities).
Diffstat (limited to 'archbuild.in')
| -rw-r--r-- | archbuild.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/archbuild.in b/archbuild.in index 32f0d03..c317cc2 100644 --- a/archbuild.in +++ b/archbuild.in @@ -17,6 +17,11 @@ else repo=${tag%-*} arch=${tag##*-} fi +if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then + set_arch=$(cat "@pkgdatadir@/setarch-aliases.d/${arch}") +else + set_arch="${arch}" +fi chroots='/var/lib/archbuild' clean_first=false @@ -69,7 +74,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 "${arch}" mkarchroot \ + setarch "${set_arch}" mkarchroot \ -C "${pacman_config}" \ -M "${makepkg_config}" \ "${chroots}/${repo}-${arch}/root" \ |