abuild: run apk add/del with --no-interactive

This commit is contained in:
fossdd 2024-10-09 21:42:21 +02:00 committed by Natanael Copa
parent 1d9568b669
commit a732ae00a1

View File

@ -2370,7 +2370,7 @@ apk_add_makedeps() {
repo_args="$repo_args --repository $(shell_escape "$REPODEST/${r##*/}")"
done < "$repo_template"
eval "$SUDO_APK" add "$apk_opt_wait" "$repo_args" \
eval "$SUDO_APK" add --no-interactive "$apk_opt_wait" "$repo_args" \
--virtual .${prefix}depends-$pkgname "\$@" || return
}
@ -2557,6 +2557,7 @@ rootbld() {
calcdeps
$SUDO_APK add --initdb --update \
--no-interactive \
--arch $CBUILD_ARCH \
--root "$BUILD_ROOT" \
${cachedir:+--cache-dir $cachedir} \
@ -2724,9 +2725,11 @@ deps() {
undeps() {
local _quiet="$@"
$SUDO_APK del $_quiet $apk_opt_wait .makedepends-$pkgname || :
$SUDO_APK del --no-interactive $_quiet $apk_opt_wait \
.makedepends-$pkgname || :
if [ -n "$CBUILDROOT" ]; then
$SUDO_APK del $_quiet --root "$CBUILDROOT" --arch "$CTARGET_ARCH" $apk_opt_wait \
$SUDO_APK del --no-interactive $_quiet \
--root "$CBUILDROOT" --arch "$CTARGET_ARCH" $apk_opt_wait \
--no-scripts .hostdepends-$pkgname || :
fi
}