Merge branch 'offload-build-handle-non-bash' into 'master'

fix(offload-build): Handle non-bash shell on build server

See merge request archlinux/devtools!293

src/lib/build/build.sh

@@ -312,7 +312,7 @@ pkgctl_build() {
 
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache stable
+		update_pacman_repo_cache multilib
 	# Check valid repos if not resolved dynamically
 	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"

src/lib/db/remove.sh

@@ -51,6 +51,7 @@ pkgctl_db_remove() {
 	local partial=0
 	local confirm=1
 	local dbscripts_options=()
+	local lookup_repo=multilib
 	local pkgname
 
 	# option checking
@@ -105,13 +106,13 @@ pkgctl_db_remove() {
 				update_pacman_repo_cache unstable
 				;;
 			*-staging)
-				update_pacman_repo_cache staging
+				update_pacman_repo_cache multilib-staging
 				;;
 			*-testing)
-				update_pacman_repo_cache testing
+				update_pacman_repo_cache multilib-testing
 				;;
 			*)
-				update_pacman_repo_cache stable
+				update_pacman_repo_cache multilib
 				;;
 		esac
 

src/lib/release.sh

@@ -124,7 +124,7 @@ pkgctl_release() {
 
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache stable
+		update_pacman_repo_cache multilib
 	# Check valid repos if not resolved dynamically
 	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"

src/lib/util/machine.sh

@@ -1,26 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_MACHINE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_MACHINE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-
-set -eo pipefail
-
-machine_get_hardware_name() {
-	uname --machine
-}
-
-machine_has_multilib() {
-	case "$(machine_get_hardware_name)" in
-		x86_64*)
-			return 0
-			;;
-	esac
-	return 1
-}

src/lib/util/pacman.sh

@@ -8,8 +8,6 @@ DEVTOOLS_INCLUDE_UTIL_PACMAN_SH=1
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/util/machine.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/machine.sh
 
 set -e
 
@@ -20,8 +18,7 @@ readonly _DEVTOOLS_MAKEPKG_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/makepkg.conf.d
 
 
 update_pacman_repo_cache() {
-	local repo=${1:-stable}
-	repo=$(pacman_resolve_virtual_repo_name "${repo}")
+	local repo=${1:-multilib}
 
 	mkdir -p "${_DEVTOOLS_PACMAN_CACHE_DIR}"
 	msg "Updating pacman database cache"
@@ -35,8 +32,7 @@ update_pacman_repo_cache() {
 
 get_pacman_repo_from_pkgbuild() {
 	local path=${1:-PKGBUILD}
-	local repo=${2:-stable}
-	repo=$(pacman_resolve_virtual_repo_name "${repo}")
+	local repo=${2:-multilib}
 	local -a pkgnames
 
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
@@ -76,7 +72,6 @@ get_pkgnames_from_repo_pkgbase() {
 
 	# update the pacman repo cache if it doesn't exist yet
 	if [[ ! -d "${_DEVTOOLS_PACMAN_CACHE_DIR}" ]]; then
-		# TODO: universe includes multilib, switch for architecture
 		update_pacman_repo_cache universe
 	fi
 
@@ -96,23 +91,3 @@ get_pkgnames_from_repo_pkgbase() {
 	printf "%s\n" "${pkgnames[@]}"
 	return 0
 }
-
-pacman_resolve_virtual_repo_name() {
-	local repo=$1
-
-	local repo_class=extra
-	if machine_has_multilib; then
-		repo_class=multilib
-	fi
-
-	case "${repo}" in
-		stable)
-			repo=${repo_class}
-			;;
-		testing|staging)
-			repo="${repo_class}-${repo}"
-			;;
-	esac
-
-	printf "%s" "${repo}"
-}

src/lib/valid-tags.sh

@@ -6,7 +6,6 @@
 # shellcheck disable=2034
 DEVTOOLS_VALID_BINARY_ARCHES=(
 	x86_64
-	aarch64
 )
 
 # shellcheck disable=2034

src/offload-build.in

@@ -94,12 +94,12 @@ makepkg_source_package || die "unable to make source package"
 rmdir --ignore-fail-on-non-empty src 2>/dev/null || true
 
 # Create a temporary directory on the server
-remote_temp=$(
-    ssh "${SSH_OPTS[@]}" -- "$server" '
-        temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
-        mkdir -p "$temp" &&
-        mktemp --directory --tmpdir="$temp"
-')
+cmd='
+    temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
+    mkdir -p "$temp" &&
+    mktemp --directory --tmpdir="$temp"
+'
+remote_temp=$(ssh "${SSH_OPTS[@]}" -- "$server" "bash -l -c '$cmd'")
 
 # Transfer the srcpkg to the server
 msg "Transferring source package to the server..."
@@ -109,36 +109,34 @@ rsync "${RSYNC_OPTS[@]}" -- "$srcpkg" "$server":"$remote_temp" || die
 
 # Prepare the srcpkg on the server
 msg "Extracting srcpkg"
-ssh "${SSH_OPTS[@]}" -- "$server" "cd ${remote_temp@Q} && bsdtar --strip-components 1 -xvf $(basename "$srcpkg")" || die
+ssh "${SSH_OPTS[@]}" -- "$server" "bash -c -l 'cd ${remote_temp@Q} && bsdtar --strip-components 1 -xvf $(basename "$srcpkg")'" || die
 
 # Run the build command on the server
 msg "Running archbuild"
 # shellcheck disable=SC2145
-if ssh "${SSH_OPTS[@]}" -t -- "$server" "cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}"; then
+if ssh "${SSH_OPTS[@]}" -t -- "$server" "bash -c -l 'cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}'"; then
     msg "Build complete"
 
     # Get an array of files that should be downloaded from the server
-    mapfile -t files < <(
-        ssh "${SSH_OPTS[@]}" -- "$server" "
-            cd ${remote_temp@Q}"' &&
-            makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
-            makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${arch}"'.conf" &&
-            if [[ -f /usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf ]]; then
-                makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf"
-            fi &&
-            while read -r file; do
-                [[ -f "${file}" ]] && printf "%s\n" "${file}" ||:
-            done < <(makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist) &&
-            printf "%s\n" '"${remote_temp@Q}/PKGBUILD"'
+    cmd='
+        cd '"${remote_temp@Q}"' &&
+        makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
+        makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${arch}"'.conf" &&
+        if [[ -f /usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf ]]; then
+            makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf"
+        fi &&
+        while read -r file; do
+            [[ -f "${file}" ]] && printf "%s\n" "${file}" ||:
+        done < <(makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist) &&
+        printf "%s\n" '"${remote_temp@Q}/PKGBUILD"'
 
-            find '"${remote_temp@Q}"' -name "*.log"
-    ')
+        find '"${remote_temp@Q}"' -name "*.log"
+    '
+    mapfile -t files < <(ssh "${SSH_OPTS[@]}" -- "$server" "bash -c -l '$cmd'")
 else
     # Build failed, only the logs should be downloaded from the server
-    mapfile -t files < <(
-        ssh "${SSH_OPTS[@]}" -- "$server" '
-            find '"${remote_temp@Q}"' -name "*.log"
-    ')
+    cmd='find '"${remote_temp@Q}"' -name "*.log"'
+    mapfile -t files < <(ssh "${SSH_OPTS[@]}" -- "$server" "bash -c -l '$cmd'")
 fi