|
|
|
@ -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'
|
|
|
|
@ -183,9 +184,7 @@ prepare_chroot() {
|
|
|
|
|
|
|
|
|
|
$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
|
|
|
|
|
|
|
|
|
|
sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
|
|
|
|
|
for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
|
|
|
|
|
"MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
|
|
|
|
|
for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest
|
|
|
|
|
do
|
|
|
|
|
grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
|
|
|
|
|
echo "$x" >>"$copydir/etc/makepkg.conf"
|
|
|
|
@ -225,7 +224,9 @@ _chrootbuild() {
|
|
|
|
|
# use "$" in arguments to commands with "sudo -i". ${foo} or
|
|
|
|
|
# ${1} is OK, but $foo or $1 isn't.
|
|
|
|
|
# https://bugzilla.sudo.ws/show_bug.cgi?id=765
|
|
|
|
|
sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
|
|
|
|
mkdir /build/.distcc
|
|
|
|
|
chown builduser /build/.distcc
|
|
|
|
|
sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
|
|
|
|
ret=$?
|
|
|
|
|
case $ret in
|
|
|
|
|
0|14)
|
|
|
|
@ -257,7 +258,7 @@ download_sources() {
|
|
|
|
|
# Ensure sources are downloaded
|
|
|
|
|
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
|
|
|
|
|
env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
|
|
|
|
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
|
|
|
|
|
makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o ||
|
|
|
|
|
die "Could not download sources."
|
|
|
|
|
|
|
|
|
|
# Clean up garbage from verifysource
|
|
|
|
@ -304,7 +305,7 @@ move_products() {
|
|
|
|
|
# }}}
|
|
|
|
|
|
|
|
|
|
main() {
|
|
|
|
|
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
|
|
|
|
default_makepkg_args=(--syncdeps --noconfirm --holdver --skipinteg)
|
|
|
|
|
makepkg_args=("${default_makepkg_args[@]}")
|
|
|
|
|
keepbuilddir=false
|
|
|
|
|
update_first=false
|
|
|
|
@ -325,12 +326,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" ;;
|
|
|
|
@ -352,6 +354,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
|
|
|
|
@ -415,7 +421,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[@]}" \
|
|
|
|
|