RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abuild: use static srcdir/pkgbasedir/tmpdir in rootbld 

This fixes 'abuild rootbld' failing to mount when srcdir is moved
outside of $HOME (eg. in /run). This also has the advantage of building
more reproducible even when the build path leaks into the packges (which
happens in most -dbg packages).
This commit is contained in:
Sertonix 2024-08-08 19:44:47 +02:00 committed by Natanael Copa
parent 1131a46699
commit a7e7587758
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
abuild.in
View File

@ -2527,9 +2527,8 @@ rootbld() {
"$BUILD_ROOT/$ABUILD_USERDIR" "$BUILD_ROOT/$aportsgit" \
"$BUILD_ROOT/$SRCDEST" "$BUILD_ROOT/$REPODEST" \
"$BUILD_ROOT/tmp/pkg" "$BUILD_ROOT/tmp/src" \
"$BUILD_ROOT/usr/bin" "$pkgbasedir" "$REPODEST" \
"$BUILD_ROOT/$HOME/.ccache" \
"$srcdir"
"$BUILD_ROOT/tmp/tmp" "$BUILD_ROOT/usr/bin"
"$REPODEST" "$BUILD_ROOT/$HOME/.ccache"
cp /etc/abuild.conf /etc/group /etc/passwd "$BUILD_ROOT/etc"
@ -2586,12 +2585,13 @@ rootbld() {
${USE_CCACHE:+ --bind "$HOME/.ccache" "$HOME/.ccache"} \
--bind "$SRCDEST" "$SRCDEST" \
--bind "$BUILD_ROOT/tmp" /tmp \
--bind "$BUILD_ROOT/tmp/src" "$srcdir" \
--bind "$BUILD_ROOT/tmp/pkg" "$pkgbasedir" \
--bind "$REPODEST" "$REPODEST" \
--hostname "build-$buildhost-$CARCH" \
--chdir "$startdir" \
--clearenv \
--setenv srcdir /tmp/src \
--setenv pkgbasedir /tmp/pkg \
--setenv tmpdir /tmp/tmp \
--setenv CARCH "$CARCH" \
--setenv HOME "$HOME" \
--setenv REPODEST "$REPODEST" \