From 24df755f0dc1555fdeaaa416c96a73719eb8a63c Mon Sep 17 00:00:00 2001 From: Daniil Anfimov Date: Wed, 20 May 2026 21:13:50 +0200 Subject: [PATCH] Backport b0d3dbe3: "abuild: do not export tmpdir/pkgbasedir" --- abuild-3.15.0/abuild.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/abuild.in b/abuild.in index c33a230..4447b4d 100644 --- a/abuild.in +++ b//abuild.in @@ -2563,7 +2563,13 @@ rootbld() { "$BUILD_ROOT/tmp/tmp" "$BUILD_ROOT/usr/bin" \ "$REPODEST" "$BUILD_ROOT/$HOME/.ccache" - cp /etc/abuild.conf "$BUILD_ROOT/etc" + # Avoid exporting {src,pkgbase,tmp}dir + cat - /etc/abuild.conf <<-EOF > "$BUILD_ROOT"/etc/abuild.conf + srcdir=/tmp/src + pkgbasedir=/tmp/pkg + tmpdir=/tmp/tmp + + EOF local dir for dir in /usr/share/apk/keys/$CBUILD_ARCH /etc/apk/keys; do @@ -2653,9 +2659,6 @@ rootbld() { --hostname "build-$buildhost-$CARCH" \ --chdir "$startdir" \ --clearenv \ - --setenv abuild_srcdir /tmp/src \ - --setenv pkgbasedir /tmp/pkg \ - --setenv tmpdir /tmp/tmp \ --setenv CARCH "$CARCH" \ --setenv HOME "$HOME" \ --setenv REPODEST "$REPODEST" \ @@ -2976,7 +2979,7 @@ fi APKBUILD=$(readlink -f "$APKBUILD") startdir="${APKBUILD%/*}" -srcdir=${srcdir:-${abuild_srcdir:-"$startdir/src"}} +srcdir=${srcdir:-"$startdir/src"} pkgbasedir=${pkgbasedir:-"$startdir/pkg"} tmpdir=${tmpdir:-"$startdir/tmp"} -- 2.54.0