makechrootpkg: Add option to build in temp chroot
Add option -T to build in a temporary chroot. This apply to any kind of filesytem and allow to easily parrallelize builds. This patch also simplify how $default_copy and $copy are defined. Signed-off-by: Sébastien Luttringer <seblu@seblu.net> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
parent
97a2d2414a
commit
93d735981b
|
@ -19,14 +19,15 @@ clean_first=false
|
||||||
install_pkg=
|
install_pkg=
|
||||||
add_to_db=false
|
add_to_db=false
|
||||||
run_namcap=false
|
run_namcap=false
|
||||||
|
temp_chroot=false
|
||||||
chrootdir=
|
chrootdir=
|
||||||
passeddir=
|
passeddir=
|
||||||
declare -a install_pkgs
|
declare -a install_pkgs
|
||||||
declare -i ret=0
|
declare -i ret=0
|
||||||
|
|
||||||
default_copy=$USER
|
copy=$USER
|
||||||
[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
|
[[ -n $SUDO_USER ]] && copy=$SUDO_USER
|
||||||
[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
|
[[ -z "$copy" || $copy = root ]] && copy=copy
|
||||||
src_owner=${SUDO_USER:-$USER}
|
src_owner=${SUDO_USER:-$USER}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
|
@ -55,13 +56,14 @@ usage() {
|
||||||
echo '-r <dir> The chroot dir to use'
|
echo '-r <dir> The chroot dir to use'
|
||||||
echo '-I <pkg> Install a package into the working copy of the chroot'
|
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 '-l <copy> The directory to use as the working copy of the chroot'
|
||||||
echo ' Useful for maintaining multiple copies.'
|
echo ' Useful for maintaining multiple copies'
|
||||||
echo " Default: $default_copy"
|
echo " Default: $copy"
|
||||||
echo '-n Run namcap on the package'
|
echo '-n Run namcap on the package'
|
||||||
|
echo '-T Build in a temporary directory'
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
while getopts 'hcudr:I:l:n' arg; do
|
while getopts 'hcudr:I:l:nT' arg; do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
h) usage ;;
|
h) usage ;;
|
||||||
c) clean_first=true ;;
|
c) clean_first=true ;;
|
||||||
|
@ -71,6 +73,7 @@ while getopts 'hcudr:I:l:n' arg; do
|
||||||
I) install_pkgs+=("$OPTARG") ;;
|
I) install_pkgs+=("$OPTARG") ;;
|
||||||
l) copy="$OPTARG" ;;
|
l) copy="$OPTARG" ;;
|
||||||
n) run_namcap=true; makepkg_args="$makepkg_args -i" ;;
|
n) run_namcap=true; makepkg_args="$makepkg_args -i" ;;
|
||||||
|
T) temp_chroot=true; copy+="-$RANDOM" ;;
|
||||||
*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
|
*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -81,7 +84,6 @@ chrootdir=$(readlink -e "$passeddir")
|
||||||
if [[ ${copy:0:1} = / ]]; then
|
if [[ ${copy:0:1} = / ]]; then
|
||||||
copydir=$copy
|
copydir=$copy
|
||||||
else
|
else
|
||||||
[[ -z $copy ]] && copy=$default_copy
|
|
||||||
copydir="$chrootdir/$copy"
|
copydir="$chrootdir/$copy"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -314,6 +316,21 @@ for f in "$copydir"/srcdest/*; do
|
||||||
mv "$f" "$SRCDEST"
|
mv "$f" "$SRCDEST"
|
||||||
done
|
done
|
||||||
|
|
||||||
if (( ret != 0 )); then
|
if $temp_chroot; then
|
||||||
|
stat_busy "Removing temporary directoy [$copy]"
|
||||||
|
if [[ "$chroottype" == btrfs ]]; then
|
||||||
|
btrfs subvolume delete "$copydir" >/dev/null ||
|
||||||
|
die "Unable to delete subvolume $copydir"
|
||||||
|
else
|
||||||
|
# avoid change of filesystem in case of an umount failure
|
||||||
|
rm --recursive --force --one-file-system "$copydir" ||
|
||||||
|
die "Unable to delete $copydir"
|
||||||
|
fi
|
||||||
|
# remove lock file
|
||||||
|
rm --force "$copydir.lock"
|
||||||
|
stat_done
|
||||||
|
elif (( ret != 0 )); then
|
||||||
die "Build failed, check $copydir/build"
|
die "Build failed, check $copydir/build"
|
||||||
|
else
|
||||||
|
true
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue