From 55c2ca1312e649916a9a4469b7e88464f2f20c38 Mon Sep 17 00:00:00 2001
From: Robin Candau <robincandau@protonmail.com>
Date: Fri, 23 Feb 2024 11:04:03 +0100
Subject: feat(version): let upgrade subcommand also update checksums

This commit aims to make 'pkgctl version upgrade' also update checksums
in addition of bumping the pkgver and reseting the pkgrel.

Component: pkgctl version upgrade
---
 contrib/completion/bash/devtools.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'contrib/completion/bash')

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 136c80f..6b88203 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -373,6 +373,7 @@ _pkgctl_version_setup_opts() { _filedir -d; }
 _pkgctl_version_setup_args__url_opts() { :; }
 
 _pkgctl_version_upgrade_args=(
+	--no-update-checksums
 	-v --verbose
 	-h --help
 )
-- 
cgit v1.2.3-70-g09d2


From dced77d23de2a9b00faed40350d229aaaffaa4b2 Mon Sep 17 00:00:00 2001
From: Christian Heusel <christian@heusel.eu>
Date: Tue, 23 Apr 2024 14:57:55 +0200
Subject: fix(completion): fix erroneous completion variables

The architecture definition of the variable was using invalid bash
syntax and was previously unused:

    $ _binary_arch=${DEVTOOLS_VALID_ARCHES[*]:0:-1}
    bash: -1: substring expression < 0

We therefore fix the definition of the variable and use it for the
autocompletion of the offload-build command.

Furthermore fix wrongly named architecture variables that have been
missed from previous refactoring.

Fixes #222

Component: completion
Fixes: f961e2e ("completion: implemented structured declarative bash completions")
Fixes: 4173e0a ("chore: refactor variable names in valid-{tags,repos}.sh")
Signed-off-by: Christian Heusel <christian@heusel.eu>
Co-authored-by: Levente Polyak <anthraxx@archlinux.org>
---
 contrib/completion/bash/devtools.in | 10 +++++++---
 contrib/completion/zsh/_devtools.in |  9 ++++-----
 src/lib/valid-tags.sh               |  7 ++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'contrib/completion/bash')

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 6b88203..2d5b7bf 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -14,7 +14,6 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
 # shellcheck source=src/lib/valid-search.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
 
-_binary_arch=${DEVTOOLS_VALID_ARCHES[*]:0:-1}
 _colors=(never always auto)
 
 
@@ -128,7 +127,7 @@ _offload_build_args=(
 )
 _offload_build_args__repo_opts() { _devtools_completions_build_repo; }
 _offload_build_args_r_opts() { _offload_build_args__repo_opts; }
-_offload_build_args__arch_opts() { _devtools_completions_arch; }
+_offload_build_args__arch_opts() { _devtools_completions_binary_arch; }
 _offload_build_args_a_opts() { _offload_build_args__arch_opts; }
 _offload_build_args__server_opts() { :; }
 _offload_build_args_s_opts() { _offload_build_args__server_opts; }
@@ -196,7 +195,7 @@ _pkgctl_build_args=(
 
 	-h --help
 )
-_pkgctl_build_args__arch_opts() { _devtools_completions_arch; }
+_pkgctl_build_args__arch_opts() { _devtools_completions_binary_arch; }
 _pkgctl_build_args__repo_opts() { _devtools_completions_repo; }
 _pkgctl_build_args__worker_opts() { :; }
 _pkgctl_build_args_w_opts() { _pkgctl_build_args__worker_opts; }
@@ -244,6 +243,8 @@ _pkgctl_db_remove_args=(
 	-a --arch
 	-h --help
 )
+_pkgctl_db_remove_args__arch_opts() { _devtools_completions_binary_arch; }
+_pkgctl_db_remove_args_a_opts() { _pkgctl_db_remove_args__arch_opts; }
 _pkgctl_db_remove_opts() {
 	local subcommand args
 	subcommand=(db remove)
@@ -434,6 +435,9 @@ _devtools_completions_color() {
 _devtools_completions_arch() {
 	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ARCHES[*]}" -- "$cur")
 }
+_devtools_completions_binary_arch() {
+	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BINARY_ARCHES[*]}" -- "$cur")
+}
 _devtools_completions_repo() {
 	local optional=${1:-}
 	mapfile -t COMPREPLY < <(compgen -W "${optional} ${DEVTOOLS_VALID_REPOS[*]}" -- "$cur")
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 7c0fe91..65c7352 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -14,7 +14,6 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
 # shellcheck source=src/lib/valid-search.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
 
-_binary_arch=${DEVTOOLS_VALID_ARCHES[*]:0:-1}
 _colors=(never always auto)
 
 _archbuild_args=(
@@ -41,8 +40,8 @@ _pkgctl_auth_status_args=(
 )
 
 _pkgctl_build_args=(
-	"--arch=[Specify architectures to build for (disables auto-detection)]:arch:($_arch[*])"
-	"--repo=[Specify a target repository (disables auto-detection)]:repo:($DEVTOOLS_VALID_REPOS[*])"
+	"--arch[Specify architectures to build for (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
+	"--repo[Specify a target repository (disables auto-detection)]:repo:($DEVTOOLS_VALID_REPOS[*])"
 	'(-s --staging)'{-s,--staging}'[Build against the staging counterpart of the auto-detected repo]'
 	'(-t --testing)'{-t,--testing}'[Build against the testing counterpart of the auto-detected repo]'
 	'(-o --offload)'{-o,--offload}'[Build on a remote server and transfer artifacts afterwards]'
@@ -79,7 +78,7 @@ _pkgctl_db_move_args=(
 )
 
 _pkgctl_db_remove_args=(
-	'(-a --arch=)'{-a,--arch=}"[Override the architecture (disables auto-detection)]:arch:($_arch[*])"
+	'(-a --arch)'{-a,--arch}"[Override the architecture (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
 	'(-h --help)'{-h,--help}'[Display usage]'
 	"1:repo:($DEVTOOLS_VALID_REPOS[*])"
 	'*:pkgbase:_devtools_completions_all_packages'
@@ -250,7 +249,7 @@ _sogrep_args=(
 
 _offload_build_args=(
 	'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($DEVTOOLS_VALID_BUILDREPOS[*])'
-	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${_binary_arch[*]})'
+	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${DEVTOOLS_VALID_BINARY_ARCHES[*]})'
 	'(-s --server)'{-s,--server}'[Offload to a specific Build server]:server:'
 	'(-h --help)'{-h,--help}'[Display usage]'
 )
diff --git a/src/lib/valid-tags.sh b/src/lib/valid-tags.sh
index cef0cc6..62e40ae 100644
--- a/src/lib/valid-tags.sh
+++ b/src/lib/valid-tags.sh
@@ -4,8 +4,13 @@
 :
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_ARCHES=(
+DEVTOOLS_VALID_BINARY_ARCHES=(
 	x86_64
+)
+
+# shellcheck disable=2034
+DEVTOOLS_VALID_ARCHES=(
+	"${DEVTOOLS_VALID_BINARY_ARCHES[@]}"
 	any
 )
 
-- 
cgit v1.2.3-70-g09d2


From 7b553afcb25286d04dcb4cbf12e18745e8b0139a Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Sat, 27 Apr 2024 00:40:57 +0200
Subject: feat(db): add partial split package option to db remove

By default passing a pkgbase removes all split packages, debug packages
as well as entries from the state repo for all existing architectures.

When using the `--partial` option it may most likely lead to undesired
effects by leaving debug packages behind as well as dangling entries in
the state repository. However, for specific use cases its required to
get rid of old split package parts.

Fixes #218

Component: pkgctl db remove
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
---
 contrib/completion/bash/devtools.in |  1 +
 contrib/completion/zsh/_devtools.in |  1 +
 doc/man/pkgctl-db-remove.1.asciidoc | 15 +++++++++++++--
 src/lib/db/remove.sh                | 32 +++++++++++++++++++++++++++-----
 4 files changed, 42 insertions(+), 7 deletions(-)

(limited to 'contrib/completion/bash')

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 2d5b7bf..ec45b62 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -240,6 +240,7 @@ _pkgctl_db_move_opts() {
 
 
 _pkgctl_db_remove_args=(
+	--partial
 	-a --arch
 	-h --help
 )
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 65c7352..6dc0340 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -78,6 +78,7 @@ _pkgctl_db_move_args=(
 )
 
 _pkgctl_db_remove_args=(
+	'--partial[Remove only partial pkgnames from a split package]'
 	'(-a --arch)'{-a,--arch}"[Override the architecture (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
 	'(-h --help)'{-h,--help}'[Display usage]'
 	"1:repo:($DEVTOOLS_VALID_REPOS[*])"
diff --git a/doc/man/pkgctl-db-remove.1.asciidoc b/doc/man/pkgctl-db-remove.1.asciidoc
index a95766d..9fe07c3 100644
--- a/doc/man/pkgctl-db-remove.1.asciidoc
+++ b/doc/man/pkgctl-db-remove.1.asciidoc
@@ -12,13 +12,24 @@ pkgctl db remove [OPTIONS] [REPO] [PKGBASE]...
 Description
 -----------
 
-Remove packages from pacman repositories.
+Remove packages from pacman repositories. By default passing a pkgbase removes
+all split packages, debug packages as well as entries from the state repo for
+all existing architectures.
+
+Beware when using the `--partial` option, as it may most likely lead to
+undesired effects by leaving debug packages behind as well as dangling entries
+in the state repository.
 
 Options
 -------
 
+*--partial*::
+	Remove only partial pkgnames from a split package. This leaves debug
+	packages behind and pkgbase entries in the state repo.
+
 *-a, --arch* 'ARCH'::
-	Override the architecture (disables auto-detection)
+	Remove only one specific architecture (disables auto-detection).
+	By default all architectures are removed when this option is not used.
 
 *-h, --help*::
 	Show a help text
diff --git a/src/lib/db/remove.sh b/src/lib/db/remove.sh
index ba21c83..018b793 100644
--- a/src/lib/db/remove.sh
+++ b/src/lib/db/remove.sh
@@ -17,10 +17,18 @@ pkgctl_db_remove_usage() {
 	cat <<- _EOF_
 		Usage: ${COMMAND} [OPTIONS] [REPO] [PKGBASE]...
 
-		Remove packages from binary repositories.
+		Remove packages from pacman repositories. By default passing a pkgbase removes
+		all split packages, debug packages as well as entries from the state repo for
+		all existing architectures.
+
+		Beware when using the --partial option, as it may most likely lead to
+		undesired effects by leaving debug packages behind as well as dangling entries
+		in the state repository.
 
 		OPTIONS
-		    -a, --arch    Override the architecture (disables auto-detection)
+		    -a, --arch    Remove only one specific architecture (disables auto-detection)
+		    --partial     Remove only partial pkgnames from a split package. This leaves
+		                  debug packages behind and pkgbase entries in the state repo.
 		    -h, --help    Show this help text
 
 		EXAMPLES
@@ -31,8 +39,9 @@ _EOF_
 
 pkgctl_db_remove() {
 	local REPO=""
-	local ARCH=any
 	local PKGBASES=()
+	local partial=0
+	local dbscripts_options=()
 
 	# option checking
 	while (( $# )); do
@@ -41,9 +50,14 @@ pkgctl_db_remove() {
 				pkgctl_db_remove_usage
 				exit 0
 				;;
+			--partial)
+				partial=1
+				dbscripts_options+=(--partial)
+				shift
+				;;
 			-a|--arch)
 				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				ARCH=$2
+				dbscripts_options+=(--arch "$2")
 				shift 2
 				;;
 			-*)
@@ -64,6 +78,14 @@ pkgctl_db_remove() {
 	shift
 	PKGBASES+=("$@")
 
+	# print explenation about partial removal
+	if (( partial )); then
+		echo
+		msg_warn "${YELLOW}Removing only partial pkgnames from a split package.${ALL_OFF}"
+		msg_warn "${YELLOW}This leaves debug packages and pkgbase entries in the state repo!${ALL_OFF}"
+	fi
+
 	# shellcheck disable=SC2029
-	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-remove "${REPO}" "${ARCH}" "${PKGBASES[@]}"
+	echo
+	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-remove "${dbscripts_options[@]}" "${REPO}" "${PKGBASES[@]}"
 }
-- 
cgit v1.2.3-70-g09d2


From 1d433f600e6eecfe685650a06e58d1a8edae9b5d Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Sat, 27 Apr 2024 01:50:57 +0200
Subject: feat(db): confirm list of all packages that will be removed

Sometimes it isn't obvious which set of packages are removed from a
split package when the pkgbase matches also a subset of a pkgbase. This
can happen for example with bootstrapping packages, when the intention
is to just remove a partial part of the bootstrap pkgbase.

To make the intention more explicit, list all to be removed packages and
await for confirmation.

Component: pkgctl db remove
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
---
 README.md                           |   1 +
 config/pacman/universe.conf         | 112 ++++++++++++++++++++++++++++++++++++
 config/pacman/unstable.conf         |  83 ++++++++++++++++++++++++++
 contrib/completion/bash/devtools.in |   1 +
 contrib/completion/zsh/_devtools.in |   1 +
 doc/man/pkgctl-db-remove.1.asciidoc |   3 +
 src/lib/build/build.sh              |   2 +-
 src/lib/db/remove.sh                |  57 +++++++++++++++++-
 src/lib/release.sh                  |   2 +-
 src/lib/util/pacman.sh              |  36 +++++++++++-
 src/lib/util/term.sh                |  16 ++++++
 11 files changed, 308 insertions(+), 6 deletions(-)
 create mode 100644 config/pacman/universe.conf
 create mode 100644 config/pacman/unstable.conf

(limited to 'contrib/completion/bash')

diff --git a/README.md b/README.md
index eea9c0a..c0bcfdd 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ Component: pkgctl db remove
 - coreutils
 - curl
 - diffutils
+- expac
 - fakeroot
 - findutils
 - grep
diff --git a/config/pacman/universe.conf b/config/pacman/universe.conf
new file mode 100644
index 0000000..417114b
--- /dev/null
+++ b/config/pacman/universe.conf
@@ -0,0 +1,112 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
+VerbosePkgLists
+ParallelDownloads = 5
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gnome-unstable]
+Include = /etc/pacman.d/mirrorlist
+
+[kde-unstable]
+Include = /etc/pacman.d/mirrorlist
+
+[core-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[core-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[extra-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+[multilib-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
diff --git a/config/pacman/unstable.conf b/config/pacman/unstable.conf
new file mode 100644
index 0000000..408d0ce
--- /dev/null
+++ b/config/pacman/unstable.conf
@@ -0,0 +1,83 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+NoProgressBar
+# We cannot check disk space from within a chroot environment
+#CheckSpace
+VerbosePkgLists
+ParallelDownloads = 5
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[gnome-unstable]
+Include = /etc/pacman.d/mirrorlist
+
+[kde-unstable]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index ec45b62..5125ceb 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -241,6 +241,7 @@ _pkgctl_db_move_opts() {
 
 _pkgctl_db_remove_args=(
 	--partial
+	--noconfirm
 	-a --arch
 	-h --help
 )
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 6dc0340..48ff373 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -79,6 +79,7 @@ _pkgctl_db_move_args=(
 
 _pkgctl_db_remove_args=(
 	'--partial[Remove only partial pkgnames from a split package]'
+	'--noconfirm[Bypass any confirmation messages, should only be used with caution]'
 	'(-a --arch)'{-a,--arch}"[Override the architecture (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
 	'(-h --help)'{-h,--help}'[Display usage]'
 	"1:repo:($DEVTOOLS_VALID_REPOS[*])"
diff --git a/doc/man/pkgctl-db-remove.1.asciidoc b/doc/man/pkgctl-db-remove.1.asciidoc
index 9fe07c3..85f616b 100644
--- a/doc/man/pkgctl-db-remove.1.asciidoc
+++ b/doc/man/pkgctl-db-remove.1.asciidoc
@@ -31,6 +31,9 @@ Options
 	Remove only one specific architecture (disables auto-detection).
 	By default all architectures are removed when this option is not used.
 
+*--noconfirm*::
+	Bypass any confirmation messages, should only be used with caution.
+
 *-h, --help*::
 	Show a help text
 
diff --git a/src/lib/build/build.sh b/src/lib/build/build.sh
index c3e05be..b82011b 100644
--- a/src/lib/build/build.sh
+++ b/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
+		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}"
diff --git a/src/lib/db/remove.sh b/src/lib/db/remove.sh
index 018b793..6ca091d 100644
--- a/src/lib/db/remove.sh
+++ b/src/lib/db/remove.sh
@@ -8,6 +8,10 @@ DEVTOOLS_INCLUDE_DB_REMOVE_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/pacman.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
+# shellcheck source=src/lib/util/term.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/term.sh
 
 set -e
 
@@ -29,6 +33,7 @@ pkgctl_db_remove_usage() {
 		    -a, --arch    Remove only one specific architecture (disables auto-detection)
 		    --partial     Remove only partial pkgnames from a split package. This leaves
 		                  debug packages behind and pkgbase entries in the state repo.
+		    --noconfirm   Bypass any confirmation messages, should only be used with caution
 		    -h, --help    Show this help text
 
 		EXAMPLES
@@ -40,8 +45,12 @@ _EOF_
 pkgctl_db_remove() {
 	local REPO=""
 	local PKGBASES=()
+	local pkgnames=()
 	local partial=0
+	local confirm=1
 	local dbscripts_options=()
+	local lookup_repo=multilib
+	local pkgname
 
 	# option checking
 	while (( $# )); do
@@ -60,6 +69,10 @@ pkgctl_db_remove() {
 				dbscripts_options+=(--arch "$2")
 				shift 2
 				;;
+			--noconfirm)
+				confirm=0
+				shift
+				;;
 			-*)
 				die "invalid argument: %s" "$1"
 				;;
@@ -77,6 +90,40 @@ pkgctl_db_remove() {
 	REPO=$1
 	shift
 	PKGBASES+=("$@")
+	pkgnames=("${PKGBASES[@]}")
+
+	# update pacman cache to query all pkgnames
+	if (( ! partial )); then
+		case ${REPO} in
+			*-unstable)
+				update_pacman_repo_cache unstable
+				;;
+			*-staging)
+				update_pacman_repo_cache multilib-staging
+				;;
+			*-testing)
+				update_pacman_repo_cache multilib-testing
+				;;
+			*)
+				update_pacman_repo_cache multilib
+				;;
+		esac
+
+		# fetch the pkgnames of all pkgbase as present in the repo
+		mapfile -t pkgnames < <(get_pkgnames_from_repo_pkgbase "${REPO}" "${PKGBASES[@]}")
+		echo
+
+		if (( ! ${#pkgnames[@]} )); then
+			error "Packages not found in %s" "${REPO}"
+			exit 1
+		fi
+	fi
+
+	# print list of packages
+	printf "%sRemoving packages from %s:%s\n" "${RED}" "${REPO}" "${ALL_OFF}"
+	for pkgname in "${pkgnames[@]}"; do
+		printf "• %s\n" "${pkgname}"
+	done
 
 	# print explenation about partial removal
 	if (( partial )); then
@@ -85,7 +132,15 @@ pkgctl_db_remove() {
 		msg_warn "${YELLOW}This leaves debug packages and pkgbase entries in the state repo!${ALL_OFF}"
 	fi
 
-	# shellcheck disable=SC2029
+	# ask for confirmation
+	if (( confirm )); then
+		echo
+		if ! prompt "${GREEN}${BOLD}?${ALL_OFF} Are you sure this is correct?"; then
+			exit 1
+		fi
+	fi
+
 	echo
+	# shellcheck disable=SC2029
 	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-remove "${dbscripts_options[@]}" "${REPO}" "${PKGBASES[@]}"
 }
diff --git a/src/lib/release.sh b/src/lib/release.sh
index acb3b54..ba21384 100644
--- a/src/lib/release.sh
+++ b/src/lib/release.sh
@@ -124,7 +124,7 @@ pkgctl_release() {
 
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache
+		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}"
diff --git a/src/lib/util/pacman.sh b/src/lib/util/pacman.sh
index 620e1a8..4637d28 100644
--- a/src/lib/util/pacman.sh
+++ b/src/lib/util/pacman.sh
@@ -18,10 +18,12 @@ readonly _DEVTOOLS_MAKEPKG_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/makepkg.conf.d
 
 
 update_pacman_repo_cache() {
+	local repo=${1:-multilib}
+
 	mkdir -p "${_DEVTOOLS_PACMAN_CACHE_DIR}"
 	msg "Updating pacman database cache"
 	lock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
-	fakeroot -- pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
+	fakeroot -- pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/${repo}.conf" \
 		--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
 		-Sy
 	lock_close 10
@@ -29,6 +31,7 @@ update_pacman_repo_cache() {
 
 get_pacman_repo_from_pkgbuild() {
 	local path=${1:-PKGBUILD}
+	local repo=${2:-multilib}
 
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
 	mapfile -t pkgnames < <(source "${path}"; printf "%s\n" "${pkgname[@]}")
@@ -40,12 +43,12 @@ get_pacman_repo_from_pkgbuild() {
 
 	# update the pacman repo cache if it doesn't exist yet
 	if [[ ! -d "${_DEVTOOLS_PACMAN_CACHE_DIR}" ]]; then
-		update_pacman_repo_cache
+		update_pacman_repo_cache "${repo}"
 	fi
 
 	slock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
 	# query repo of passed pkgname, specify --nodeps twice to skip all dependency checks
-	mapfile -t repos < <(pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
+	mapfile -t repos < <(pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/${repo}.conf" \
 		--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
 		--sync \
 		--nodeps \
@@ -58,3 +61,30 @@ get_pacman_repo_from_pkgbuild() {
 
 	printf "%s" "${repos[0]}"
 }
+
+get_pkgnames_from_repo_pkgbase() {
+	local repo=$1
+	shift
+	local pkgbases=("$@")
+
+	# update the pacman repo cache if it doesn't exist yet
+	if [[ ! -d "${_DEVTOOLS_PACMAN_CACHE_DIR}" ]]; then
+		update_pacman_repo_cache universe
+	fi
+
+	slock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
+	# query pkgnames of passed pkgbase inside a repo
+	mapfile -t pkgnames < <(expac --config <(sed "s|#DBPath.*|DBPath = $(realpath "${_DEVTOOLS_PACMAN_CACHE_DIR}")|" < "${_DEVTOOLS_PACMAN_CONF_DIR}/universe.conf") \
+		--sync '%r %e %n' 2>/dev/null \
+		| sort | awk -v pkgbase="${pkgbases[*]}" \
+			'BEGIN { split(pkgbase, array); for (item in array) filter[array[item]]=1 } $1=="'"${repo}"'" && $2 in filter {print $3}'
+	)
+	lock_close 10
+
+	if (( ! ${#pkgnames[@]} )); then
+		return 1
+	fi
+
+	printf "%s\n" "${pkgnames[@]}"
+	return 0
+}
diff --git a/src/lib/util/term.sh b/src/lib/util/term.sh
index 853dccf..08d044f 100644
--- a/src/lib/util/term.sh
+++ b/src/lib/util/term.sh
@@ -180,3 +180,19 @@ term_spinner_stop() {
 	# show the cursor after stopping the spinner
 	term_cursor_show
 }
+
+prompt() {
+	local message=$1
+	local answer
+
+	read -r -p "${message} (y/N) " answer
+
+	case "${answer}" in
+		y|Y|yes|Yes|YES)
+			true
+			;;
+		*)
+			false
+			;;
+	esac
+}
-- 
cgit v1.2.3-70-g09d2


From a46b2d4fb7dee11fcc508c6871b86d9bff8d01ae Mon Sep 17 00:00:00 2001
From: Robin Candau <robincandau@protonmail.com>
Date: Sun, 28 Apr 2024 12:39:20 +0200
Subject: feat(repo): add repo clean command to remove untracked files

This introduces the `pkgctl repo clean` command which removes every
untracked files from local package repositories (via `git clean`).

The usage is as simple as `pkgctl repo clean [OPTION] [PATH]` (where
"[PATH]" can be equal to a wildcard "*").

Component: pkgctl repo clean
---
 contrib/completion/bash/devtools.in  |   7 +++
 contrib/completion/zsh/_devtools.in  |   8 +++
 doc/man/pkgctl-repo-clean.1.asciidoc |  40 ++++++++++++
 doc/man/pkgctl-repo.1.asciidoc       |   4 ++
 src/lib/repo.sh                      |  10 +++
 src/lib/repo/clean.sh                | 114 +++++++++++++++++++++++++++++++++++
 6 files changed, 183 insertions(+)
 create mode 100644 doc/man/pkgctl-repo-clean.1.asciidoc
 create mode 100644 src/lib/repo/clean.sh

(limited to 'contrib/completion/bash')

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 5125ceb..136beef 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -292,6 +292,7 @@ _pkgctl_aur_drop_from_repo_opts() { _filedir -d; }
 
 
 _pkgctl_repo_cmds=(
+	clean
 	clone
 	configure
 	create
@@ -317,6 +318,12 @@ _pkgctl_repo_clone_args__jobs_opts() { :; }
 _pkgctl_repo_clone_args_j_opts() { _pkgctl_repo_clone_args__jobs_opts; }
 _pkgctl_repo_clone_opts() { _devtools_completions_all_packages; }
 
+_pkgctl_repo_clean_args=(
+	-i --interactive
+	-n --dry-run
+	-h --help
+)
+_pkgctl_repo_clean_opts() { _filedir -d; }
 
 _pkgctl_repo_configure_args=(
 	--protocol
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 48ff373..65d7895 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -114,6 +114,7 @@ _pkgctl_aur_drop_from_repo_args=(
 
 _pkgctl_repo_cmds=(
 	"pkgctl repo command"
+	"clean[Remove untracked files from the working tree]"
 	"clone[Clone a package repository]"
 	"configure[Configure a clone according to distro specs]"
 	"create[Create a new GitLab package repository]"
@@ -128,6 +129,13 @@ _pkgctl_repo_switch_args=(
 	'*:git_dir:_files -/'
 )
 
+_pkgctl_repo_clean_args=(
+	'(-i --interactive)'{-i,--interactive}'[Show what would be done and clean files interactively]'
+	'(-n --dry-run)'{-n,--dry-run}"[Don't remove anything, just show what would be done]"
+	'(-h --help)'{-h,--help}'[Display usage]'
+	'*:git_dir:_files -/'
+)
+
 _pkgctl_repo_clone_args=(
 	'(-m --maintainer=)'{-m,--maintainer=}'[Clone all packages of the named maintainer]:maintainer:'
 	'--protocol[Clone the repository over https]:proto:(https)'
diff --git a/doc/man/pkgctl-repo-clean.1.asciidoc b/doc/man/pkgctl-repo-clean.1.asciidoc
new file mode 100644
index 0000000..b39693c
--- /dev/null
+++ b/doc/man/pkgctl-repo-clean.1.asciidoc
@@ -0,0 +1,40 @@
+pkgctl-repo-clean(1)
+====================
+
+Name
+----
+
+pkgctl-repo-clean - Remove untracked files from the working tree
+
+Synopsis
+--------
+
+pkgctl repo clean [OPTION] [PATH]...
+
+Description
+-----------
+
+Cleans the working tree by recursively removing files that are not under
+version control, starting from the current directory.
+
+Files unknown to Git as well as ignored files are removed. This can, for
+example, be useful to remove all build products.
+
+Options
+-------
+
+*-i, --interactive*::
+	Show what would be done and clean files interactively
+
+*-n, --dry-run*::
+	Don't actually remove anything, just show what would be done
+
+*-h, --help*::
+	Show a help text
+
+See Also
+--------
+
+git-clean(1)
+
+include::include/footer.asciidoc[]
diff --git a/doc/man/pkgctl-repo.1.asciidoc b/doc/man/pkgctl-repo.1.asciidoc
index 3d0f3f1..c1fd298 100644
--- a/doc/man/pkgctl-repo.1.asciidoc
+++ b/doc/man/pkgctl-repo.1.asciidoc
@@ -32,6 +32,9 @@ Options
 Subcommands
 -----------
 
+pkgctl repo clean::
+	Remove untracked files from the working tree
+
 pkgctl repo clone::
 	Clone a package repository
 
@@ -50,6 +53,7 @@ pkgctl repo web::
 See Also
 --------
 
+pkgctl-repo-clean(1)
 pkgctl-repo-clone(1)
 pkgctl-repo-configure(1)
 pkgctl-repo-create(1)
diff --git a/src/lib/repo.sh b/src/lib/repo.sh
index 9f545e9..8f8dd0a 100644
--- a/src/lib/repo.sh
+++ b/src/lib/repo.sh
@@ -27,6 +27,7 @@ pkgctl_repo_usage() {
 		without SSH access using read-only HTTPS.
 
 		COMMANDS
+		    clean          Remove untracked files from the working tree
 		    clone          Clone a package repository
 		    configure      Configure a clone according to distro specs
 		    create         Create a new GitLab package repository
@@ -37,6 +38,7 @@ pkgctl_repo_usage() {
 		    -h, --help     Show this help text
 
 		EXAMPLES
+		    $ ${COMMAND} clean --interactive *
 		    $ ${COMMAND} clone libfoo linux libbar
 		    $ ${COMMAND} clone --maintainer mynickname
 		    $ ${COMMAND} configure *
@@ -59,6 +61,14 @@ pkgctl_repo() {
 				pkgctl_repo_usage
 				exit 0
 				;;
+			clean)
+				_DEVTOOLS_COMMAND+=" $1"
+				shift
+				# shellcheck source=src/lib/repo/clean.sh
+				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/clean.sh
+				pkgctl_repo_clean "$@"
+				exit 0
+				;;
 			clone)
 				_DEVTOOLS_COMMAND+=" $1"
 				shift
diff --git a/src/lib/repo/clean.sh b/src/lib/repo/clean.sh
new file mode 100644
index 0000000..bb8980e
--- /dev/null
+++ b/src/lib/repo/clean.sh
@@ -0,0 +1,114 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${DEVTOOLS_INCLUDE_REPO_CLEAN_SH:-} ]] || return 0
+DEVTOOLS_INCLUDE_REPO_CLEAN_SH=1
+
+_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+# shellcheck source=src/lib/common.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+
+source /usr/share/makepkg/util/message.sh
+
+set -eo pipefail
+
+
+pkgctl_repo_clean_usage() {
+	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+	cat <<- _EOF_
+		Usage: ${COMMAND} [OPTION] [PATH]...
+
+		Cleans the working tree by recursively removing files that are not under
+		version control, starting from the current directory.
+
+		Files unknown to Git as well as ignored files are removed. This can, for
+		example, be useful to remove all build products.
+
+		OPTIONS
+		    -i, --interactive   Show what would be done and clean files interactively
+		    -n, --dry-run       Don't remove anything, just show what would be done
+		    -h, --help          Show this help text
+
+		EXAMPLES
+		    $ ${COMMAND} libfoo linux libbar
+		    $ ${COMMAND} --interactive libfoo linux libbar
+		    $ ${COMMAND} --dry-run *
+_EOF_
+}
+
+pkgctl_repo_clean() {
+	# options
+	local git_clean_options=()
+	local paths
+
+	local path pkgbase
+
+	while (( $# )); do
+		case $1 in
+			-i|--interactive)
+				git_clean_options+=("$1")
+				shift
+				;;
+			-n|--dry-run)
+				git_clean_options+=("$1")
+				shift
+				;;
+			-h|--help)
+				pkgctl_repo_clean_usage
+				exit 0
+				;;
+			--)
+				shift
+				break
+				;;
+			-*)
+				die "invalid argument: %s" "$1"
+				;;
+			*)
+				paths=("$@")
+				break
+				;;
+		esac
+	done
+
+	# check if invoked without any path from within a packaging repo
+	if (( ${#paths[@]} == 0 )); then
+		paths=(".")
+	fi
+
+	# print message about the work chunk
+	printf "🗑️ Removing untracked files from %s working trees\n" "${BOLD}${#paths[@]}${ALL_OFF}"
+
+	for path in "${paths[@]}"; do
+		# skip paths that are not directories
+		if [[ ! -d "${path}" ]]; then
+			continue
+		fi
+
+		if [[ ! -f "${path}/PKGBUILD" ]]; then
+			msg_error "Not a package repository: ${path}"
+			continue
+		fi
+
+		if [[ ! -d "${path}/.git" ]]; then
+			msg_error "Not a Git repository: ${path}"
+			continue
+		fi
+
+		pkgbase=$(basename "$(realpath "${path}")")
+		pkgbase=${pkgbase%.git}
+
+		# run dry mode to see if git would clean any files
+		if [[ ! $(git -C "${path}" clean -x -d --dry-run 2>&1) ]]; then
+			continue
+		fi
+
+		# git clean untracked files
+		msg_success "Cleaning ${BOLD}${pkgbase}${ALL_OFF}"
+		if ! git -C "${path}" clean -x -d --force "${git_clean_options[@]}"; then
+			msg_error "Failed to remove untracked files"
+		fi
+		echo
+	done
+}
-- 
cgit v1.2.3-70-g09d2


From 2b62ac660d258858f7a7795a113a7056d0d2c79d Mon Sep 17 00:00:00 2001
From: "Frédéric Pierret (fepitre)" <frederic.pierret@qubes-os.org>
Date: Sun, 4 Feb 2024 12:03:50 +0100
Subject: feat(mkarchroot): allow to specify file destination inside chroot

Co-authored-by: Christian Heusel <christian@heusel.eu>
---
 contrib/completion/bash/devtools.in |  2 ++
 contrib/completion/zsh/_devtools.in |  1 +
 doc/man/arch-nspawn.1.asciidoc      |  5 +++--
 doc/man/mkarchroot.1.asciidoc       |  3 ++-
 src/arch-nspawn.in                  | 19 +++++++++++--------
 src/mkarchroot.in                   | 21 ++++++++++++---------
 6 files changed, 31 insertions(+), 20 deletions(-)

(limited to 'contrib/completion/bash')

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 136beef..4073efe 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -61,12 +61,14 @@ _mkarchroot_args=(
 	-C
 	-M
 	-c
+	-f
 	-h
 )
 _mkarchroot_args_U_opts() { _filedir '*.pkg.tar.*'; }
 _mkarchroot_args_C_opts() { _filedir '*.conf'; }
 _mkarchroot_args_M_opts() { _filedir '*.conf'; }
 _mkarchroot_args_c_opts() { _filedir -d; }
+_mkarchroot_args_f_opts() { _filedir -d; }
 _mkarchroot_opts() {
 	local args
 	args=$(__pkgctl_word_count_after_subcommand)
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index 65d7895..d38733f 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -237,6 +237,7 @@ _mkarchroot_args=(
 	'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
 	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
 	'-c[Set pacman cache]:pacman_cache:_files -/'
+	'-f[Copy src file from the host to the chroot]:target:_files -/'
 	'-h[Display usage]'
 	'1:working_dir:_files -/'
 	'*:packages:_devtools_completions_all_packages'
diff --git a/doc/man/arch-nspawn.1.asciidoc b/doc/man/arch-nspawn.1.asciidoc
index a3e8ec1..ae6532b 100644
--- a/doc/man/arch-nspawn.1.asciidoc
+++ b/doc/man/arch-nspawn.1.asciidoc
@@ -28,8 +28,9 @@ Options
 *-c* <dir>::
 	Set pacman cache, if no directory is specified the passed pacman.conf's cachedir is used with a fallback to '/etc/pacman.conf'
 
-*-f* <file>::
-	Copy file from the host to the chroot
+*-f* <src>[:<dst>]::
+	Copy file from the host to the chroot.
+	If 'dst' is not provided, it defaults to 'src' inside of the chroot.
 
 *-s*::
 	Do not run setarch
diff --git a/doc/man/mkarchroot.1.asciidoc b/doc/man/mkarchroot.1.asciidoc
index 99905c8..edbb17e 100644
--- a/doc/man/mkarchroot.1.asciidoc
+++ b/doc/man/mkarchroot.1.asciidoc
@@ -32,8 +32,9 @@ Options
 *-c* <dir>::
 	Set pacman cache.
 
-*-f* <file>::
+*-f* <src>[:<dst>]::
 	Copy file from the host to the chroot.
+	If 'dst' is not provided, it defaults to 'src' inside of the chroot.
 
 *-s*::
 	Do not run setarch.
diff --git a/src/arch-nspawn.in b/src/arch-nspawn.in
index a4504a1..bd99adc 100644
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -22,12 +22,13 @@ usage() {
 	echo "A wrapper around systemd-nspawn. Provides support for pacman."
 	echo
 	echo ' options:'
-	echo '    -C <file>     Location of a pacman config file'
-	echo '    -M <file>     Location of a makepkg config file'
-	echo '    -c <dir>      Set pacman cache'
-	echo '    -f <file>     Copy file from the host to the chroot'
-	echo '    -s            Do not run setarch'
-	echo '    -h            This message'
+	echo '    -C <file>           Location of a pacman config file'
+	echo '    -M <file>           Location of a makepkg config file'
+	echo '    -c <dir>            Set pacman cache'
+	echo '    -f <src>[:<dst>]    Copy src file from the host to the chroot.'
+	echo '                        If dst file is not provided, it defaults to src'
+	echo '    -s                  Do not run setarch'
+	echo '    -h                  This message'
 	exit 1
 }
 
@@ -114,8 +115,10 @@ copy_hostconf () {
 
 	local file
 	for file in "${files[@]}"; do
-		mkdir -p "$(dirname "$working_dir$file")"
-		cp -T "$file" "$working_dir$file"
+		src="${file%%:*}"
+		dst="${file#*:}"
+		mkdir -p "$(dirname "$working_dir$dst")"
+		cp -T "$src" "$working_dir$dst"
 	done
 
 	sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf"
diff --git a/src/mkarchroot.in b/src/mkarchroot.in
index fc60b4e..06cf5d2 100644
--- a/src/mkarchroot.in
+++ b/src/mkarchroot.in
@@ -22,13 +22,14 @@ nspawn_args=()
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir package-list..."
 	echo ' options:'
-	echo '    -U            Use pacman -U to install packages'
-	echo '    -C <file>     Location of a pacman config file'
-	echo '    -M <file>     Location of a makepkg config file'
-	echo '    -c <dir>      Set pacman cache'
-	echo '    -f <file>     Copy file from the host to the chroot'
-	echo '    -s            Do not run setarch'
-	echo '    -h            This message'
+	echo '    -U                  Use pacman -U to install packages'
+	echo '    -C <file>           Location of a pacman config file'
+	echo '    -M <file>           Location of a makepkg config file'
+	echo '    -c <dir>            Set pacman cache'
+	echo '    -f <src>[:<dst>]    Copy src file from the host to the chroot.'
+	echo '                        If dst file is not provided, it defaults to src'
+	echo '    -s                  Do not run setarch'
+	echo '    -h                  This message'
 	exit 1
 }
 
@@ -84,8 +85,10 @@ if is_btrfs "$working_dir"; then
 fi
 
 for file in "${files[@]}"; do
-	mkdir -p "$(dirname "$working_dir$file")"
-	cp "$file" "$working_dir$file"
+	src="${file%%:*}"
+	dst="${file#*:}"
+	mkdir -p "$(dirname "$working_dir$dst")"
+	cp "$src" "$working_dir$dst"
 done
 
 unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \
-- 
cgit v1.2.3-70-g09d2


From 5f198534144f09d09f9e4c0541d8da15f8c1aed3 Mon Sep 17 00:00:00 2001
From: 依云 <lilydjwg@gmail.com>
Date: Sat, 14 Jan 2023 00:44:55 +0800
Subject: feat: support bind mounting a tmpfs

A .cache can be bind mounted into the container to save the caches for
reuse, but sometimes we want to exclude specific caches (because they
don't work well, e.g. bazel's).

Component: makechrootpkg
---
 contrib/completion/bash/devtools.in |  2 ++
 contrib/completion/zsh/_devtools.in |  1 +
 doc/man/makechrootpkg.1.asciidoc    |  7 ++++++
 src/makechrootpkg.in                | 44 ++++++++++++++++++++-----------------
 4 files changed, 34 insertions(+), 20 deletions(-)

(limited to 'contrib/completion/bash')

diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in
index 4073efe..9025b46 100644
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -27,6 +27,7 @@ _makechrootpkg_args=(
 	-I
 	-l
 	-n
+	-t
 	-T
 	-U
 	-x
@@ -36,6 +37,7 @@ _makechrootpkg_args_D_opts() { _filedir -d; }
 _makechrootpkg_args_r_opts() { _filedir -d; }
 _makechrootpkg_args_I_opts() { _filedir '*.pkg.tar.*'; }
 _makechrootpkg_args_l_opts() { _filedir -d; }
+_makechrootpkg_args_t_opts() { _filedir -d; }
 _makechrootpkg_args_U_opts() { :; }
 _makechrootpkg_args_x_opts() { _devtools_completions_inspect; }
 _makechrootpkg() { __devtools_complete _makechrootpkg; }
diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in
index d38733f..5c1b264 100644
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -222,6 +222,7 @@ _makechrootpkg_args=(
 	'-c[Clean the chroot before building]'
 	'*-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
 	'*-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
+	'*-t[Mount a tmpfs at directory]:tmpfs_dir:_files -/'
 	'-u[Update the working copy of the chroot before building]'
 	'-r[The chroot dir to use]:chroot_dir:_files -/'
 	'*-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
diff --git a/doc/man/makechrootpkg.1.asciidoc b/doc/man/makechrootpkg.1.asciidoc
index 3aa1be5..34ba199 100644
--- a/doc/man/makechrootpkg.1.asciidoc
+++ b/doc/man/makechrootpkg.1.asciidoc
@@ -45,6 +45,9 @@ Options
 *-D* <dir>::
 	Bind directory into build chroot as read-only
 
+*-t* <dir>[:opts]::
+	Mount a tmpfs at 'dir'. See the '--tmpfs' argument in systemd-nspawn(1) for more details.
+
 *-u*::
 	Update the working copy of the chroot before building
 	This is useful for rebuilds without dirtying the pristine
@@ -76,5 +79,9 @@ Options
 *-x* <when>::
 	Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
 
+See Also
+--------
+
+systemd-nspawn(1)
 
 include::include/footer.asciidoc[]
diff --git a/src/makechrootpkg.in b/src/makechrootpkg.in
index 459f7ce..9df14e8 100644
--- a/src/makechrootpkg.in
+++ b/src/makechrootpkg.in
@@ -38,6 +38,7 @@ inspect=never
 
 bindmounts_ro=()
 bindmounts_rw=()
+bindmounts_tmpfs=()
 
 copy=$USER
 [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
@@ -65,23 +66,24 @@ usage() {
 	echo "Default makepkg args: ${default_makepkg_args[*]}"
 	echo ''
 	echo 'Flags:'
-	echo '-h         This help'
-	echo '-c         Clean the chroot before building'
-	echo '-d <dir>   Bind directory into build chroot as read-write'
-	echo '-D <dir>   Bind directory into build chroot as read-only'
-	echo '-u         Update the working copy of the chroot before building'
-	echo '           This is useful for rebuilds without dirtying the pristine'
-	echo '           chroot'
-	echo '-r <dir>   The chroot dir to use'
-	echo '-I <pkg>   Install a package into the working copy of the chroot'
-	echo '-l <copy>  The directory to use as the working copy of the chroot'
-	echo '           Useful for maintaining multiple copies'
-	echo "           Default: $copy"
-	echo '-n         Run namcap on the package'
-	echo '-C         Run checkpkg on the package'
-	echo '-T         Build in a temporary directory'
-	echo '-U         Run makepkg as a specified user'
-	echo '-x <when>  Inspect chroot after build (never, always, failure)'
+	echo '-h                This help'
+	echo '-c                Clean the chroot before building'
+	echo '-d <dir>          Bind directory into build chroot as read-write'
+	echo '-D <dir>          Bind directory into build chroot as read-only'
+	echo '-t <dir[:opts]>   Mount a tmpfs at directory'
+	echo '-u                Update the working copy of the chroot before building'
+	echo '                  This is useful for rebuilds without dirtying the pristine'
+	echo '                  chroot'
+	echo '-r <dir>          The chroot dir to use'
+	echo '-I <pkg>          Install a package into the working copy of the chroot'
+	echo '-l <copy>         The directory to use as the working copy of the chroot'
+	echo '                  Useful for maintaining multiple copies'
+	echo "                  Default: $copy"
+	echo '-n                Run namcap on the package'
+	echo '-C                Run checkpkg on the package'
+	echo '-T                Build in a temporary directory'
+	echo '-U                Run makepkg as a specified user'
+	echo '-x <when>         Inspect chroot after build (never, always, failure)'
 	exit 1
 }
 
@@ -148,7 +150,7 @@ install_packages() {
 	pkgnames=("${install_pkgs[@]##*/}")
 
 	cp -- "${install_pkgs[@]}" "$copydir/root/"
-	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
+	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
 	ret=$?
 	rm -- "${pkgnames[@]/#/$copydir/root/}"
@@ -291,11 +293,12 @@ move_products() {
 }
 # }}}
 
-while getopts 'hcur:I:l:nCTD:d:U:x:' arg; do
+while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
 	case "$arg" in
 		c) clean_first=1 ;;
 		D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
 		d) bindmounts_rw+=("--bind=$OPTARG") ;;
+		t) bindmounts_tmpfs+=("--tmpfs=$OPTARG") ;;
 		u) update_first=1 ;;
 		r) passeddir="$OPTARG" ;;
 		I) install_pkgs+=("$OPTARG") ;;
@@ -365,7 +368,7 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
 fi
 
 (( update_first )) && arch-nspawn "$copydir" \
-		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
+		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -Syuu --noconfirm
 
 if [[ -n ${install_pkgs[*]:-} ]]; then
@@ -390,6 +393,7 @@ nspawn_build_args=(
 	--tmpfs="/tmp:${tmp_opts}"
 	"${bindmounts_ro[@]}"
 	"${bindmounts_rw[@]}"
+	"${bindmounts_tmpfs[@]}"
 )
 
 if arch-nspawn "$copydir" \
-- 
cgit v1.2.3-70-g09d2