wip ports

src/commitpkg.in

@@ -7,8 +7,6 @@ _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
 # shellcheck source=src/lib/util/srcinfo.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/srcinfo.sh
-# shellcheck source=src/lib/state.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/state.sh
 
 source /usr/share/makepkg/util/util.sh
 
@@ -248,9 +246,6 @@ declare -a uploads
 declare -a commit_arches
 declare -a skip_arches
 
-BUILD_STATE_DIR=$(get_state_folder "build-state")
-state_file=
-
 for _arch in "${arch[@]}"; do
 	if [[ -n $commit_arch && ${_arch} != "$commit_arch" ]]; then
 		skip_arches+=("$_arch")
@@ -264,12 +259,6 @@ for _arch in "${arch[@]}"; do
 			skip_arches+=("$_arch")
 			continue 2
 		fi
-
-		state_file="${BUILD_STATE_DIR}/$(basename "${pkgfile}").txt"
-		if [[ -f "${state_file}" ]] && [[ $(cat "${state_file}") != "${repo}" ]]; then
-			error "%s was not built against '%s', aborting" "${pkgfile}" "${repo}"
-			exit 1
-		fi
 		uploads+=("$pkgfile")
 	done
 

src/lib/build/build.sh

@@ -12,8 +12,6 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
 # shellcheck source=src/lib/release.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
-# shellcheck source=src/lib/state.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/state.sh
 # shellcheck source=src/lib/util/git.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
 # shellcheck source=src/lib/util/srcinfo.sh
@@ -131,7 +129,6 @@ pkgctl_build() {
 	local PKGVER=
 	local PKGREL=
 	local MESSAGE=
-	local BUILD_STATE_DIR=
 
 	local paths=()
 	local BUILD_ARCH=()
@@ -307,8 +304,6 @@ pkgctl_build() {
 		fi
 	fi
 
-	BUILD_STATE_DIR=$(get_state_folder "build-state")
-
 	# assign default worker slot
 	if [[ -z ${WORKER_SLOT} ]] && ! WORKER_SLOT="$(tty | sed 's|/dev/pts/||')"; then
 		WORKER_SLOT=$(( RANDOM % $(nproc) + 1 ))
@@ -317,7 +312,7 @@ pkgctl_build() {
 
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache multilib
+		update_pacman_repo_cache stable
 	# Check valid repos if not resolved dynamically
 	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"
@@ -486,26 +481,25 @@ pkgctl_build() {
 		# shellcheck disable=SC2119
 		write_srcinfo_file
 
-		# shellcheck disable=2119
-		load_makepkg_config
+		# test-install (some of) the produced packages
+		if [[ ${INSTALL_TO_HOST} == auto ]] || [[ ${INSTALL_TO_HOST} == all ]]; then
+			# shellcheck disable=2119
+			load_makepkg_config
 
-		# this is inspired by print_all_package_names from libmakepkg
-		local version pkg_architecture pkg pkgfile
-		version=$(get_full_version)
+			# this is inspired by print_all_package_names from libmakepkg
+			local version pkg_architecture pkg pkgfile
+			version=$(get_full_version)
 
-		for pkg in "${pkgname[@]}"; do
-			pkg_architecture=$(get_pkg_arch "$pkg")
-			pkgpath=$(realpath "$(printf "%s\n" "${PKGDEST:-.}")")
-			pkgfile=$(printf "%s-%s-%s%s\n" "$pkg" "$version" "$pkg_architecture" "$PKGEXT")
+			for pkg in "${pkgname[@]}"; do
+				pkg_architecture=$(get_pkg_arch "$pkg")
+				pkgfile=$(realpath "$(printf "%s/%s-%s-%s%s\n" "${PKGDEST:-.}" "$pkg" "$version" "$pkg_architecture" "$PKGEXT")")
 
-			# check if we install all packages or if the (split-)package is already installed
-			if [[ ${INSTALL_TO_HOST} == all ]] || ( [[ ${INSTALL_TO_HOST} == auto ]] && pacman -Qq -- "$pkg" &>/dev/null ); then
-				INSTALL_HOST_PACKAGES+=("${pkgpath}/${pkgfile}")
-			fi
-
-			# save against which repo we have built the package
-			printf "%s" "${pkgrepo}" > "${BUILD_STATE_DIR}/${pkgfile}.txt"
-		done
+				# check if we install all packages or if the (split-)package is already installed
+				if [[ ${INSTALL_TO_HOST} == all ]] || ( [[ ${INSTALL_TO_HOST} == auto ]] && pacman -Qq -- "$pkg" &>/dev/null ); then
+					INSTALL_HOST_PACKAGES+=("$pkgfile")
+				fi
+			done
+		fi
 
 		# release the build
 		if (( RELEASE )); then

src/lib/db/remove.sh

@@ -51,7 +51,6 @@ pkgctl_db_remove() {
 	local partial=0
 	local confirm=1
 	local dbscripts_options=()
-	local lookup_repo=multilib
 	local pkgname
 
 	# option checking
@@ -106,13 +105,13 @@ pkgctl_db_remove() {
 				update_pacman_repo_cache unstable
 				;;
 			*-staging)
-				update_pacman_repo_cache multilib-staging
+				update_pacman_repo_cache staging
 				;;
 			*-testing)
-				update_pacman_repo_cache multilib-testing
+				update_pacman_repo_cache testing
 				;;
 			*)
-				update_pacman_repo_cache multilib
+				update_pacman_repo_cache stable
 				;;
 		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 multilib
+		update_pacman_repo_cache stable
 	# Check valid repos if not resolved dynamically
 	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"

src/lib/state.sh

@@ -1,18 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_STATE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_STATE_SH=1
-
-set -e
-
-readonly XDG_DEVTOOLS_STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/devtools"
-
-get_state_folder() {
-	local foldername=$1
-	local path="${XDG_DEVTOOLS_STATE_DIR}/${foldername}"
-
-	mkdir --parents -- "$path"
-	printf '%s' "${path}"
-}

src/lib/util/machine.sh

@@ -0,0 +1,26 @@
+#!/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,6 +8,8 @@ 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
 
@@ -18,7 +20,8 @@ readonly _DEVTOOLS_MAKEPKG_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/makepkg.conf.d
 
 
 update_pacman_repo_cache() {
-	local repo=${1:-multilib}
+	local repo=${1:-stable}
+	repo=$(pacman_resolve_virtual_repo_name "${repo}")
 
 	mkdir -p "${_DEVTOOLS_PACMAN_CACHE_DIR}"
 	msg "Updating pacman database cache"
@@ -32,7 +35,8 @@ update_pacman_repo_cache() {
 
 get_pacman_repo_from_pkgbuild() {
 	local path=${1:-PKGBUILD}
-	local repo=${2:-multilib}
+	local repo=${2:-stable}
+	repo=$(pacman_resolve_virtual_repo_name "${repo}")
 	local -a pkgnames
 
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
@@ -72,6 +76,7 @@ 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
 
@@ -91,3 +96,23 @@ 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,6 +6,7 @@
 # shellcheck disable=2034
 DEVTOOLS_VALID_BINARY_ARCHES=(
 	x86_64
+	aarch64
 )
 
 # shellcheck disable=2034