main/abuild: backport APORTS_BOOTSTRAP support

pass APORTS_BOOTSTRAP to bubblewrap
This commit is contained in:
Natanael Copa 2024-04-19 23:44:38 +02:00
parent e4b015975c
commit 3d9cd5d0ed
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From eeca95d195652ef3506a154e9d18fd98f0dbf5b2 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 19 Apr 2024 23:41:45 +0200
Subject: [PATCH] abuild: pass APORTS_BOOTSTRAP to bubblewrap
---
abuild.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/abuild.in b/abuild.in
index 3e41902..ac0b6ff 100644
--- a/abuild.in
+++ b/abuild.in
@@ -2627,6 +2627,7 @@ rootbld() {
--setenv REPODEST "$REPODEST" \
--setenv ABUILD_USERDIR "$ABUILD_USERDIR" \
${ABUILD_BOOTSTRAP:+--setenv ABUILD_BOOTSTRAP "$ABUILD_BOOTSTRAP"} \
+ ${APORTS_BOOTSTRAP:+--setenv APORTS_BOOTSTRAP "$APORTS_BOOTSTRAP"} \
--setenv SOURCE_DATE_EPOCH "$SOURCE_DATE_EPOCH" \
--setenv ABUILD_LAST_COMMIT "$ABUILD_LAST_COMMIT" \
--setenv PATH ${USE_CCACHE:+/usr/lib/ccache/bin:}/bin:/usr/bin:/sbin:/usr/sbin \
--
2.44.0

View File

@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.13.0
_ver=${pkgver%_git*}
pkgrel=0
pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@ -36,6 +36,7 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch
"
builddir="$srcdir"/abuild-$pkgver
@ -121,4 +122,5 @@ _sudo() {
sha512sums="
9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da abuild-3.13.0.tar.gz
2d7cf76202bd50e97fa3ed517c82dd94cbddd27b43d51e41e97c4281092565046aa55cab0869b20753c6bc1d592194528700a779426b67177b9ee7632c943742 0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch
"