mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-10-05 12:06:18 +02:00
Compare commits
2 Commits
run0
...
88064d03f4
Author | SHA1 | Date | |
---|---|---|---|
![]() |
88064d03f4 | ||
![]() |
753d2daf65 |
@@ -14,7 +14,7 @@ Description
|
||||
|
||||
Build a PKGBUILD on a remote server using makechrootpkg. Requires a remote user
|
||||
that can run archbuild in a non-interactive manner, e.g. must be able to
|
||||
elevate permissions using passwordless run0.
|
||||
elevate permissions using passwordless sudo.
|
||||
|
||||
Options
|
||||
-------
|
||||
|
@@ -3,7 +3,7 @@ pkgctl-auth(1)
|
||||
|
||||
Name
|
||||
----
|
||||
pkgctl-auth - Authenticate with services like GitLab.
|
||||
pkgctl-auth - Authenticate with serivces like GitLab.
|
||||
|
||||
Synopsis
|
||||
--------
|
||||
|
@@ -15,11 +15,7 @@ check_root() {
|
||||
local orig_argv=("$@")
|
||||
|
||||
(( EUID == 0 )) && return
|
||||
if type -P run0 >/dev/null; then
|
||||
keepenv=",$keepenv"
|
||||
command="run0 ${keepenv//,/ --setenv=}"
|
||||
exec ${command} -- "${orig_argv[@]}"
|
||||
elif type -P sudo >/dev/null; then
|
||||
if type -P sudo >/dev/null; then
|
||||
exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
|
||||
else
|
||||
exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
|
||||
|
@@ -140,6 +140,32 @@ pkgctl_version_check() {
|
||||
pushd "${path}" >/dev/null
|
||||
|
||||
if [[ ${output_format} == pretty ]]; then
|
||||
# initialize the tmp file for status output
|
||||
section_separator=''
|
||||
printf "" > "${status_dir}/tmp"
|
||||
|
||||
# update the current list of failed packages
|
||||
if (( ${#failure[@]} > 0 )); then
|
||||
exit_code=${PKGCTL_VERSION_CHECK_EXIT_FAILURE}
|
||||
printf "%sFailure%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}" >> "${status_dir}/tmp" 2>&1
|
||||
section_separator=$'\n'
|
||||
for result in "${failure[@]}"; do
|
||||
msg_error " ${result}" >> "${status_dir}/tmp" 2>&1
|
||||
done
|
||||
fi
|
||||
|
||||
# update the current list of out-of-date packages
|
||||
if (( ${#out_of_date[@]} > 0 )); then
|
||||
exit_code=${PKGCTL_VERSION_CHECK_EXIT_OUT_OF_DATE}
|
||||
printf "%sOut-of-date%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}" >> "${status_dir}/tmp" 2>&1
|
||||
section_separator=$'\n'
|
||||
for result in "${out_of_date[@]}"; do
|
||||
msg_warn " ${result}" >> "${status_dir}/tmp" 2>&1
|
||||
done
|
||||
fi
|
||||
|
||||
printf "%s" "${section_separator}" >> "${status_dir}/tmp"
|
||||
|
||||
# update the current terminal spinner status
|
||||
(( ++current_item ))
|
||||
pkgctl_version_check_spinner \
|
||||
@@ -217,6 +243,9 @@ pkgctl_version_check() {
|
||||
return 0
|
||||
fi
|
||||
|
||||
# reset the section separator after loop
|
||||
section_separator=''
|
||||
|
||||
if (( verbose )) && (( ${#up_to_date[@]} > 0 )); then
|
||||
printf "%sUp-to-date%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}"
|
||||
section_separator=$'\n'
|
||||
@@ -408,7 +437,7 @@ pkgctl_version_check_spinner() {
|
||||
pkgctl_version_check_summary \
|
||||
"${up_to_date_count}" \
|
||||
"${out_of_date_count}" \
|
||||
"${failure_count}" > "${tmp_file}"
|
||||
"${failure_count}" >> "${tmp_file}"
|
||||
|
||||
# print the progress status
|
||||
printf "📡 Checking: %s/%s [%s] %%spinner%%" \
|
||||
|
@@ -185,18 +185,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 +222,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 +243,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 +252,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."
|
||||
}
|
||||
@@ -409,7 +400,7 @@ if arch-nspawn "$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 ))
|
||||
@@ -462,7 +453,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
|
||||
|
@@ -192,7 +192,7 @@ for p in "$@"; do
|
||||
pkgfile=${pkgfile_remote#file://}
|
||||
if [[ ! -f ${pkgfile} ]]; then
|
||||
msg "Downloading package '%s' into pacman's cache" "${pkgfile}"
|
||||
run0 -- pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1
|
||||
sudo pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1
|
||||
pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null)
|
||||
pkgfile="${pkgfile_remote#file://}"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user