wip ports

.gitlab-ci.yml

@@ -24,7 +24,7 @@ test:
   stage: test
   needs: []
   script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats bats-assert bats-support
+    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats
     - make test BATS_EXTRA_ARGS='--formatter junit'
   artifacts:
     reports:
@@ -34,7 +34,7 @@ coverage:
   stage: test
   needs: []
   script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats bats-assert bats-support kcov jq
+    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats kcov jq
     - make coverage
   coverage: '/Percent covered\s+\d+\.\d+/'
   artifacts:

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 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/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/repo/configure.sh

@@ -109,11 +109,6 @@ pkgctl_repo_configure() {
 	local -r command=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
 	local path realpath pkgbase remote_url project_path hook
 	local PACKAGER GPGKEY packager_name packager_email
-	
-	# Check if we're in a git repo
-	if ! git rev-parse --git-dir &>/dev/null; then
-		die "Not in a git repository"
-	fi
 
 	while (( $# )); do
 		case $1 in
@@ -155,8 +150,7 @@ pkgctl_repo_configure() {
 
 	# check if invoked without any path from within a packaging repo
 	if (( ${#paths[@]} == 0 )); then
-		if [[ -d .git ]] || git rev-parse --git-dir &>/dev/null; then
-			# We're in a git repository, so use current directory
+		if [[ -f PKGBUILD ]]; then
 			paths=(".")
 		else
 			pkgctl_repo_configure_usage
@@ -232,19 +226,10 @@ pkgctl_repo_configure() {
 
 		pushd "${path}" >/dev/null
 
-		# Check if this is a packaging repository
-		local is_packaging_repo=0
-		if [[ -f PKGBUILD ]]; then
-			is_packaging_repo=1
-		fi
-
-		# Configure remote only for packaging repositories
-		if (( is_packaging_repo )); then
-			project_path=$(gitlab_project_name_to_path "${pkgbase}")
-			remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
-			if ! git remote add origin "${remote_url}" &>/dev/null; then
-				git remote set-url origin "${remote_url}"
-			fi
+		project_path=$(gitlab_project_name_to_path "${pkgbase}")
+		remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
+		if ! git remote add origin "${remote_url}" &>/dev/null; then
+			git remote set-url origin "${remote_url}"
 		fi
 
 		# move the master branch to main
@@ -254,7 +239,7 @@ pkgctl_repo_configure() {
 		fi
 
 		# configure spec version and variant to avoid using development hooks in production
-		git config devtools.version "${GIT_REPO_SPEC_VERSION:-1.0.0}"
+		git config devtools.version "${GIT_REPO_SPEC_VERSION}"
 		if [[ ${_DEVTOOLS_LIBRARY_DIR} == /usr/share/devtools ]]; then
 			git config devtools.variant canonical
 		else
@@ -264,12 +249,8 @@ pkgctl_repo_configure() {
 
 		git config pull.rebase true
 		git config branch.autoSetupRebase always
-		
-		# Configure branch remote settings only for packaging repositories with remotes
-		if (( is_packaging_repo )) && git remote | grep -q "^origin$"; then
-			git config branch.main.remote origin
-			git config branch.main.rebase true
-		fi
+		git config branch.main.remote origin
+		git config branch.main.rebase true
 
 		git config transfer.fsckobjects true
 		git config fetch.fsckobjects true

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

test/case/repo-configure.bats

@@ -1,71 +0,0 @@
-#!/usr/bin/env bats
-bats_require_minimum_version 1.5.0
-
-# Load bats libraries
-load "/usr/lib/bats/bats-support/load.bash"
-load "/usr/lib/bats/bats-assert/load.bash"
-
-export _DEVTOOLS_LIBRARY_DIR="${PWD}/src"
-
-_pkgctl_repo_configure() {
-	source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
-	pkgctl_repo_configure "$@"
-}
-
-@test "repo-configure-valid-packaging" {
-	local tmpdir
-	tmpdir=$(mktemp -dt devtools.test.repo-configure.XXXXXX)
-	pushd "${tmpdir}"
-	git init
-	git remote add origin "https://gitlab.archlinux.org/archlinux/packaging/packages/devtools.git"
-	run _pkgctl_repo_configure
-	assert_success
-	popd
-	rm -rf "${tmpdir}"
-}
-
-@test "repo-configure-non-packaging" {
-	local tmpdir
-	tmpdir=$(mktemp -dt devtools.test.repo-configure.XXXXXX)
-	pushd "${tmpdir}"
-	git init
-	git remote add origin "https://gitlab.com/kicad/libraries/kicad-packages3D.git"
-	run _pkgctl_repo_configure
-	assert_success
-	popd
-	rm -rf "${tmpdir}"
-}
-
-@test "repo-configure-non-arch" {
-	local tmpdir
-	tmpdir=$(mktemp -dt devtools.test.repo-configure.XXXXXX)
-	pushd "${tmpdir}"
-	git init
-	git remote add origin "https://github.com/torvalds/linux.git"
-	run _pkgctl_repo_configure
-	assert_success
-	popd
-	rm -rf "${tmpdir}"
-}
-
-@test "repo-configure-no-git" {
-	local tmpdir
-	tmpdir=$(mktemp -dt devtools.test.repo-configure.XXXXXX)
-	pushd "${tmpdir}"
-	run ! _pkgctl_repo_configure
-	assert_failure
-	assert_output --partial "Not in a git repository"
-	popd
-	rm -rf "${tmpdir}"
-}
-
-@test "repo-configure-local-git" {
-	local tmpdir
-	tmpdir=$(mktemp -dt devtools.test.repo-configure.XXXXXX)
-	pushd "${tmpdir}"
-	git init
-	run _pkgctl_repo_configure
-	assert_success
-	popd
-	rm -rf "${tmpdir}"
-}