forked from rpms/abuild
Compare commits
2 Commits
danfimov-p
...
c9
| Author | SHA1 | Date | |
|---|---|---|---|
| 376773e675 | |||
| 83f125912e |
@ -1,32 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -11,7 +11,6 @@ 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
|
|
||||||
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
@ -55,7 +54,6 @@ 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
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make VERSION=%{version}
|
make VERSION=%{version}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user