Compare commits
9 Commits
master
...
custom-202
Author | SHA1 | Date |
---|---|---|
Martchus | 6e4ac88443 | |
Martchus | 342d07e271 | |
Kevin Mihelich | af391deb11 | |
Kevin Mihelich | c974b39667 | |
Kevin Mihelich | 773fec5dab | |
Kevin Mihelich | eb3f3e32b5 | |
Kevin Mihelich | 091f17998b | |
Kevin Mihelich | 03424d6b86 | |
Kevin Mihelich | 1b8f057508 |
|
@ -97,7 +97,7 @@ copy_hostconf () {
|
|||
unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
|
||||
pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
|
||||
|
||||
printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
|
||||
#printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
|
||||
|
||||
[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
|
||||
[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
|
||||
|
@ -127,9 +127,12 @@ eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
|
|||
|
||||
[[ -z $nosetarch ]] || unset CARCH
|
||||
|
||||
exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
|
||||
exec systemd-nspawn -q \
|
||||
-D "$working_dir" \
|
||||
-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
|
||||
--register=no --keep-unit --as-pid2 \
|
||||
--register=no \
|
||||
--as-pid2 \
|
||||
--rlimit=NOFILE=10000 \
|
||||
--resolv-conf=copy-host \
|
||||
"${mount_args[@]}" \
|
||||
"$@"
|
||||
|
|
|
@ -69,7 +69,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
|
|||
|
||||
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
|
||||
(umask 0022; mkdir -p "${chroots}/${repo}-${arch}")
|
||||
setarch "${arch}" mkarchroot \
|
||||
mkarchroot \
|
||||
-C "${pacman_config}" \
|
||||
-M "${makepkg_config}" \
|
||||
"${chroots}/${repo}-${arch}/root" \
|
||||
|
|
|
@ -17,7 +17,7 @@ source /usr/share/makepkg/util/config.sh
|
|||
|
||||
shopt -s nullglob
|
||||
|
||||
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
||||
default_makepkg_args=(--syncdeps --noconfirm --holdver --skipinteg)
|
||||
makepkg_args=("${default_makepkg_args[@]}")
|
||||
verifysource_args=()
|
||||
chrootdir=
|
||||
|
@ -64,6 +64,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'
|
||||
|
@ -171,9 +172,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"
|
||||
|
@ -213,7 +212,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)
|
||||
|
@ -238,7 +239,7 @@ download_sources() {
|
|||
# Ensure sources are downloaded
|
||||
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
|
||||
env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
|
||||
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
|
||||
makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
|
||||
die "Could not download sources."
|
||||
}
|
||||
|
||||
|
@ -273,12 +274,13 @@ move_products() {
|
|||
}
|
||||
# }}}
|
||||
|
||||
while getopts 'hcur:I:l:nCTD:d:U:' arg; do
|
||||
while getopts 'hcuC:r:I:l:nCTD:d:U:' arg; do
|
||||
case "$arg" in
|
||||
c) clean_first=1 ;;
|
||||
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
||||
d) bindmounts_rw+=("--bind=$OPTARG") ;;
|
||||
u) update_first=1 ;;
|
||||
C) cache_dir="-c $OPTARG" ;;
|
||||
r) passeddir="$OPTARG" ;;
|
||||
I) install_pkgs+=("$OPTARG") ;;
|
||||
l) copy="$OPTARG" ;;
|
||||
|
@ -360,7 +362,8 @@ download_sources
|
|||
|
||||
prepare_chroot
|
||||
|
||||
if arch-nspawn "$copydir" \
|
||||
if arch-nspawn $cache_dir "$copydir" \
|
||||
--setenv=TERM=xterm \
|
||||
--bind="${PWD//:/\\:}:/startdir" \
|
||||
--bind="${SRCDEST//:/\\:}:/srcdest" \
|
||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||
|
|
Loading…
Reference in New Issue