arch-patches (#58)

Reviewed-on: artix/artools#58
Co-authored-by: artoo <artoo@artixlinux.org>
Co-committed-by: artoo <artoo@artixlinux.org>

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.24
+V=0.26
 
 TOOLS = artools
 PREFIX ?= /usr
@@ -22,6 +22,8 @@ BASE_DATA = \
 PKG_CONF = \
 	data/conf/artools-pkg.conf
 
+SETARCH_ALIASES = \
+
 PKG_BIN = \
 	bin/pkg/buildpkg \
 	bin/pkg/deploypkg \
@@ -105,7 +107,7 @@ FILEMODE = -m0644
 MODE =  -m0755
 LN = ln -sf
 RM = rm -f
-M4 = m4 -P
+M4 = m4 -P --define=m4_artools_pkg_version=$V
 CHMODAW = chmod a-w
 CHMODX = chmod +x
 
@@ -137,6 +139,9 @@ install_base:
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(BASE_DATA) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
+	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d
+	for a in ${SETARCH_ALIASES}; do install $(FILEMODE) setarch-aliases.d/$$a $(DESTDIR)$(DATADIR)/$(TOOLS)/setarch-aliases.d; done
+
 install_pkg:
 	install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
 	install $(FILEMODE) $(PKG_CONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)

bin/base/chroot-run.in

@@ -168,7 +168,13 @@ eval "$(grep '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
 [[ -z $nosetarch ]] || unset CARCH
 
-${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
+if [[ -f "@datadir@/artools/setarch-aliases.d/${CARCH}" ]]; then
+	read -r set_arch < "@datadir@/artools/setarch-aliases.d/${CARCH}"
+else
+	set_arch="${CARCH}"
+fi
+
+${CARCH:+setarch "${set_arch}"} chroot "${working_dir}" "$@"
 
 ret=$?
 

bin/pkg/buildpkg.in

@@ -72,6 +72,12 @@ get_pacman_conf "${repo}"
 
 get_makepkg_conf
 
+if [[ -f "${DATADIR}/setarch-aliases.d/${arch}" ]]; then
+	read -r set_arch < "${DATADIR}/setarch-aliases.d/${arch}"
+else
+	set_arch="${arch}"
+fi
+
 check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME
 
 mkchrootpkg_args+=("${@:$OPTIND}")
@@ -92,7 +98,7 @@ if ${create_first} || [[ ! -d "${chroots_pkg}/${repo}-${arch}" ]];then
 
     rm -rf --one-file-system "${chroots_pkg}/${repo}-${arch}"
     (umask 0022; mkdir -p "${chroots_pkg}/${repo}-${arch}")
-    setarch "${arch}" mkchroot \
+    setarch "${set_arch}" mkchroot \
         -C "${pacman_conf}" \
         -M "${makepkg_conf}" \
         "${chroots_pkg}/${repo}-${arch}/root" \

bin/pkg/mkchrootpkg.in

@@ -15,6 +15,9 @@
 m4_include(lib/base/message.sh)
 m4_include(lib/base/chroot.sh)
 
+export BUILDTOOL=artools-pkg
+export BUILDTOOLVER=m4_artools_pkg_version
+
 shopt -s nullglob
 
 default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
@@ -193,6 +196,8 @@ EOF
         printf '#!/bin/bash\n'
         declare -f _chrootbuild
         declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
+        declare -p BUILDTOOL 2>/dev/null
+		declare -p BUILDTOOLVER 2>/dev/null
         printf '_chrootbuild "$@" || exit\n'
 
         if (( run_namcap )); then
@@ -218,7 +223,10 @@ _chrootbuild() {
     # use "$" in arguments to commands with "sudo -i".  ${foo} or
     # ${1} is OK, but $foo or $1 isn't.
     # https://bugzilla.sudo.ws/show_bug.cgi?id=765
-    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+    sudo --preserve-env=SOURCE_DATE_EPOCH \
+        -preserve-env=BUILDTOOL \
+		--preserve-env=BUILDTOOLVER \
+        -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
     ret=$?
     case $ret in
         0|14)
@@ -305,7 +313,7 @@ done
 [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
 makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
 
 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$passeddir")