makechrootpkg: cache dir
This commit is contained in:
parent
a49f55cbed
commit
0482ed934e
|
@ -38,6 +38,7 @@ usage() {
|
|||
echo 'Flags:'
|
||||
echo '-h This help'
|
||||
echo '-c Clean the chroot before building'
|
||||
echo '-C <dir> Set pacman cache to pass to arch-nspawn'
|
||||
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'
|
||||
|
@ -321,12 +322,13 @@ main() {
|
|||
[[ -z "$copy" || $copy = root ]] && copy=copy
|
||||
src_owner=${SUDO_USER:-$USER}
|
||||
|
||||
while getopts 'hcur:I:l:nTD:d:U:' arg; do
|
||||
while getopts 'hcuC:r:I:l:nTD:d:U:' arg; do
|
||||
case "$arg" in
|
||||
c) clean_first=true ;;
|
||||
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
||||
d) bindmounts_rw+=("--bind=$OPTARG") ;;
|
||||
u) update_first=true ;;
|
||||
C) cache_dir="$OPTARG" ;;
|
||||
r) passeddir="$OPTARG" ;;
|
||||
I) install_pkgs+=("$OPTARG") ;;
|
||||
l) copy="$OPTARG" ;;
|
||||
|
@ -348,6 +350,10 @@ main() {
|
|||
[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
|
||||
[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir"
|
||||
|
||||
if [ -n "$cache_dir" ]; then
|
||||
cache_dir="-c $cache_dir"
|
||||
fi
|
||||
|
||||
if [[ ${copy:0:1} = / ]]; then
|
||||
copydir=$copy
|
||||
else
|
||||
|
@ -411,7 +417,7 @@ main() {
|
|||
|
||||
prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
|
||||
|
||||
if arch-nspawn "$copydir" \
|
||||
if arch-nspawn $cache_dir "$copydir" \
|
||||
--bind="$PWD:/startdir" \
|
||||
--bind="$SRCDEST:/srcdest" \
|
||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||
|
|
Loading…
Reference in New Issue