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
3 changed files with 2 additions and 2 deletions

View File

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

View File

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

View File

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