Compare commits
3 Commits
c9
...
danfimov-p
| Author | SHA1 | Date | |
|---|---|---|---|
| d402682d78 | |||
| 9e10dd6110 | |||
| d3b499dcdd |
32
SOURCES/0003-Do-not-use-bwrap-clearenv.patch
Normal file
32
SOURCES/0003-Do-not-use-bwrap-clearenv.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From cbba7b83994cba4a4c5839a02e17e6e17b26629a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||||
|
Date: Mon, 7 Jul 2025 18:13:35 +0000
|
||||||
|
Subject: [PATCH] Do not use bwrap clearenv
|
||||||
|
|
||||||
|
---
|
||||||
|
abuild.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/abuild.in b/abuild.in
|
||||||
|
index 3a455e3..789cb55 100644
|
||||||
|
--- a/abuild.in
|
||||||
|
+++ b/abuild.in
|
||||||
|
@@ -2650,7 +2650,6 @@ rootbld() {
|
||||||
|
--bind "$REPODEST" "$REPODEST" \
|
||||||
|
--hostname "build-$buildhost-$CARCH" \
|
||||||
|
--chdir "$startdir" \
|
||||||
|
- --clearenv \
|
||||||
|
--setenv abuild_srcdir /tmp/src \
|
||||||
|
--setenv pkgbasedir /tmp/pkg \
|
||||||
|
--setenv tmpdir /tmp/tmp \
|
||||||
|
@@ -2666,6 +2665,7 @@ rootbld() {
|
||||||
|
--setenv PATH ${USE_CCACHE:+/usr/lib/ccache/bin:}/bin:/usr/bin:/sbin:/usr/sbin \
|
||||||
|
--setenv FAKEROOTDONTTRYCHOWN 1 \
|
||||||
|
--unsetenv CBUILD \
|
||||||
|
+ /usr/bin/env -i \
|
||||||
|
/usr/bin/abuild $force rootbld_actions
|
||||||
|
update_abuildrepo_index
|
||||||
|
cleanup $CLEANUP
|
||||||
|
--
|
||||||
|
2.43.5
|
||||||
|
|
||||||
23
SOURCES/0004-Pass-startdir-as-a-bind-mount.patch
Normal file
23
SOURCES/0004-Pass-startdir-as-a-bind-mount.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
From 7b11a7796d1fcfd14a58ea0a46c953f18d0c3066 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniil Anfimov <anfimovdan@gmail.com>
|
||||||
|
Date: Thu, 4 Sep 2025 14:23:00 +0300
|
||||||
|
Subject: [PATCH] Pass $startdir as a bind mount
|
||||||
|
|
||||||
|
---
|
||||||
|
abuild-3.15.0/abuild.in | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/abuild.in b/abuild.in
|
||||||
|
index c33a230..f6761e5 100644
|
||||||
|
--- a/abuild.in
|
||||||
|
+++ b/abuild.in
|
||||||
|
@@ -2650,6 +2650,7 @@ rootbld() {
|
||||||
|
--bind "$BUILD_ROOT/tmp" /tmp \
|
||||||
|
--bind "$BUILD_ROOT/var/tmp" /var/tmp \
|
||||||
|
--bind "$REPODEST" "$REPODEST" \
|
||||||
|
+ --bind "$startdir" "$startdir" \
|
||||||
|
--hostname "build-$buildhost-$CARCH" \
|
||||||
|
--chdir "$startdir" \
|
||||||
|
--clearenv \
|
||||||
|
--
|
||||||
|
2.50.1
|
||||||
@ -11,6 +11,8 @@ Source2: %{name}.tmpfiles
|
|||||||
|
|
||||||
Patch0: 0001-Do-not-build-docs.patch
|
Patch0: 0001-Do-not-build-docs.patch
|
||||||
Patch1: 0002-Allow-running-abuild-rootbld.patch
|
Patch1: 0002-Allow-running-abuild-rootbld.patch
|
||||||
|
Patch2: 0003-Do-not-use-bwrap-clearenv.patch
|
||||||
|
Patch3: 0004-Pass-startdir-as-a-bind-mount.patch
|
||||||
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
@ -54,6 +56,8 @@ abuild is a set of scripts used to build Alpine Linux packages.
|
|||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
#patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make VERSION=%{version}
|
make VERSION=%{version}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user