Compare commits

..

2 Commits

Author SHA1 Message Date
Kristian Klausen
57f0511628 Merge branch 'github/fork/petronny/master' into 'master'
archbuild: read CacheDir from corresponding pacman.conf when mkarchchroot

See merge request archlinux/devtools!50
2025-08-03 05:27:55 +00:00
Jingbei Li
cdaf0cf86f archbuild: read CacheDir from corresponding pacman.conf when mkarchchroot 2020-06-24 21:51:04 +08:00
6 changed files with 4 additions and 9 deletions

View File

@@ -150,7 +150,6 @@ _pkgctl_cmds=(
db
diff
issue
license
release
repo
search

View File

@@ -3,7 +3,7 @@ pkgctl-auth(1)
Name
----
pkgctl-auth - Authenticate with services like GitLab.
pkgctl-auth - Authenticate with serivces like GitLab.
Synopsis
--------

View File

@@ -49,9 +49,6 @@ pkgctl diff::
pkgctl issue::
Work with GitLab packaging issues
pkgctl license::
Check and manage package licenses
pkgctl release::
Release step to commit, tag and upload build artifacts
@@ -73,7 +70,6 @@ pkgctl-build(1)
pkgctl-db(1)
pkgctl-diff(1)
pkgctl-issue(1)
pkgctl-license(1)
pkgctl-release(1)
pkgctl-repo(1)
pkgctl-search(1)

View File

@@ -78,6 +78,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
# Pass all arguments after -- right to makepkg
makechrootpkg_args+=("${@:$OPTIND}")
cachedir=$(pacman-conf -c "${pacman_config}" CacheDir)
# Automatically recreate the root chroot if a version mismatch is detected
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
@@ -105,6 +106,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
setarch "${set_arch}" mkarchroot \
-C "${pacman_config}" \
-M "${makepkg_config}" \
-c "${cachedir}" \
"${chroots}/${repo}-${arch}/root" \
"${base_packages[@]}" || abort
else

View File

@@ -54,8 +54,7 @@ export RSYNC_OPTS=(
--human-readable
--progress
--partial
# suffix the partial dir with the PID in order to avoid clashes
--partial-dir=.partial.$$
--partial-dir=.partial
--delay-updates
)

View File

@@ -188,7 +188,6 @@ path = [
"README.md",
"keys/**",
".SRCINFO",
".gitignore",
".nvchecker.toml",
"*.install",
"*.sysusers",