|
|
|
@@ -20,6 +20,7 @@ shopt -s nullglob
|
|
|
|
|
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
|
|
|
|
makepkg_args=("${default_makepkg_args[@]}")
|
|
|
|
|
verifysource_args=()
|
|
|
|
|
archnspawn_args=()
|
|
|
|
|
chrootdir=
|
|
|
|
|
passeddir=
|
|
|
|
|
makepkg_user=
|
|
|
|
@@ -80,6 +81,7 @@ usage() {
|
|
|
|
|
echo ' Useful for maintaining multiple copies'
|
|
|
|
|
echo " Default: $copy"
|
|
|
|
|
echo '-n Run namcap on the package'
|
|
|
|
|
echo "-s Do not run setarch"
|
|
|
|
|
echo '-C Run checkpkg on the package'
|
|
|
|
|
echo '-T Build in a temporary directory'
|
|
|
|
|
echo '-U Run makepkg as a specified user'
|
|
|
|
@@ -150,7 +152,7 @@ install_packages() {
|
|
|
|
|
pkgnames=("${install_pkgs[@]##*/}")
|
|
|
|
|
|
|
|
|
|
cp -- "${install_pkgs[@]}" "$copydir/root/"
|
|
|
|
|
arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
|
|
|
|
arch-nspawn "${archnspawn_args[@]}" "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
|
|
|
|
pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
|
|
|
|
|
ret=$?
|
|
|
|
|
rm -- "${pkgnames[@]/#/$copydir/root/}"
|
|
|
|
@@ -185,18 +187,10 @@ prepare_chroot() {
|
|
|
|
|
echo "$x" >>"$copydir/etc/makepkg.conf"
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# TODO(gromit): check if this rule is sane
|
|
|
|
|
# TODO(gromit): this will require a full container
|
|
|
|
|
cat > "$copydir/etc/polkit-1/rules.d/10-systemd-nopasswd.rules" <<EOF
|
|
|
|
|
polkit.addRule(function(action, subject) {
|
|
|
|
|
if (action.id == "org.freedesktop.systemd1.manage-units") {
|
|
|
|
|
if (subject.isInGroup("wheel")) {
|
|
|
|
|
return polkit.Result.YES;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
|
|
|
|
|
builduser ALL = NOPASSWD: /usr/bin/pacman
|
|
|
|
|
EOF
|
|
|
|
|
chmod 440 "$copydir/etc/polkit-1/rules.d/10-systemd-nopasswd.rules"
|
|
|
|
|
chmod 440 "$copydir/etc/sudoers.d/builduser-pacman"
|
|
|
|
|
|
|
|
|
|
cat > "$copydir/etc/gitconfig" <<EOF
|
|
|
|
|
[safe]
|
|
|
|
@@ -230,14 +224,17 @@ _chrootbuild() {
|
|
|
|
|
# shellcheck source=/dev/null
|
|
|
|
|
. /etc/profile
|
|
|
|
|
|
|
|
|
|
run0 --setenv=SOURCE_DATE_EPOCH \
|
|
|
|
|
--setenv=BUILDTOOL \
|
|
|
|
|
--setenv=BUILDTOOLVER \
|
|
|
|
|
--via-shell --chdir='~' \
|
|
|
|
|
--user=builduser -- bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
|
|
|
|
# Beware, there are some stupid arbitrary rules on how you can
|
|
|
|
|
# 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 \
|
|
|
|
|
--preserve-env=BUILDTOOL \
|
|
|
|
|
--preserve-env=BUILDTOOLVER \
|
|
|
|
|
-iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
|
|
|
|
ret=$?
|
|
|
|
|
case $ret in
|
|
|
|
|
0)
|
|
|
|
|
0|14)
|
|
|
|
|
return 0;;
|
|
|
|
|
*)
|
|
|
|
|
return $ret;;
|
|
|
|
@@ -248,7 +245,7 @@ _chrootnamcap() {
|
|
|
|
|
pacman -S --needed --noconfirm namcap
|
|
|
|
|
for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
|
|
|
|
|
echo "Checking ${pkgfile##*/}"
|
|
|
|
|
run0 --user=builduser -- namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
|
|
|
|
|
sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -257,12 +254,8 @@ download_sources() {
|
|
|
|
|
chown "$makepkg_user:" "$WORKDIR"
|
|
|
|
|
|
|
|
|
|
# Ensure sources are downloaded
|
|
|
|
|
run0 --user="$makepkg_user" \
|
|
|
|
|
--setenv=GNUPGHOME \
|
|
|
|
|
--setenv=SSH_AUTH_SOCK \
|
|
|
|
|
--setenv=SRCDEST="$SRCDEST" \
|
|
|
|
|
--setenv=BUILDDIR="$WORKDIR" \
|
|
|
|
|
--chdir=. -- \
|
|
|
|
|
sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
|
|
|
|
|
env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
|
|
|
|
|
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
|
|
|
|
|
die "Could not download sources."
|
|
|
|
|
}
|
|
|
|
@@ -302,7 +295,7 @@ move_products() {
|
|
|
|
|
}
|
|
|
|
|
# }}}
|
|
|
|
|
|
|
|
|
|
while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
|
|
|
|
|
while getopts 'hcur:sI:l:nCTD:d:U:x:t:' arg; do
|
|
|
|
|
case "$arg" in
|
|
|
|
|
c) clean_first=1 ;;
|
|
|
|
|
D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
|
|
|
|
@@ -310,6 +303,7 @@ while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
|
|
|
|
|
t) bindmounts_tmpfs+=("--tmpfs=$OPTARG") ;;
|
|
|
|
|
u) update_first=1 ;;
|
|
|
|
|
r) passeddir="$OPTARG" ;;
|
|
|
|
|
s) archnspawn_args+=("-s") ;;
|
|
|
|
|
I) install_pkgs+=("$OPTARG") ;;
|
|
|
|
|
l) copy="$OPTARG" ;;
|
|
|
|
|
n) run_namcap=1; makepkg_args+=(--install) ;;
|
|
|
|
@@ -376,7 +370,7 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
|
|
|
|
|
sync_chroot "$chrootdir" "$copydir" "$copy"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
(( update_first )) && arch-nspawn "$copydir" \
|
|
|
|
|
(( update_first )) && arch-nspawn "${archnspawn_args[@]}" "$copydir" \
|
|
|
|
|
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
|
|
|
|
|
pacman -Syuu --noconfirm
|
|
|
|
|
|
|
|
|
@@ -405,11 +399,11 @@ nspawn_build_args=(
|
|
|
|
|
"${bindmounts_tmpfs[@]}"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if arch-nspawn "$copydir" \
|
|
|
|
|
if arch-nspawn "${archnspawn_args[@]}" "$copydir" \
|
|
|
|
|
"${nspawn_build_args[@]}" \
|
|
|
|
|
/chrootbuild "${makepkg_args[@]}"
|
|
|
|
|
then
|
|
|
|
|
mapfile -t pkgnames < <(run0 --user="$makepkg_user" -- bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
|
|
|
|
|
mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
|
|
|
|
|
move_products
|
|
|
|
|
else
|
|
|
|
|
(( ret += 1 ))
|
|
|
|
@@ -453,7 +447,7 @@ else
|
|
|
|
|
for remotepkg in "${remotepkgs[@]}"; do
|
|
|
|
|
if [[ $remotepkg != file://* ]]; then
|
|
|
|
|
msg2 "Downloading current versions"
|
|
|
|
|
arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
|
|
|
|
|
arch-nspawn "${archnspawn_args[@]}" "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
|
|
|
|
|
mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
|
|
|
|
|
--dbpath "$copydir"/var/lib/pacman \
|
|
|
|
|
-Sddp "${pkgnames[@]}")
|
|
|
|
@@ -462,7 +456,7 @@ else
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
msg2 "Checking packages"
|
|
|
|
|
run0 --user="$makepkg_user" -- checkpkg --rmdir --warn --makepkg-config "$copydir/etc/makepkg.conf" "${remotepkgs[@]/#file:\/\//}"
|
|
|
|
|
sudo -u "$makepkg_user" checkpkg --rmdir --warn --makepkg-config "$copydir/etc/makepkg.conf" "${remotepkgs[@]/#file:\/\//}"
|
|
|
|
|
fi
|
|
|
|
|
true
|
|
|
|
|
fi
|
|
|
|
|