dawids/lang-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unshare
Some checks failed
Build Project / build (push) Failing after 47s
Details

Browse source
This commit is contained in:
Dawid Sobczak 2025-04-20 09:25:22 +01:00
parent 15ca0301a6
commit af51df7530
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
06/build.sh
View file

@ -41,7 +41,8 @@ fi
MKDIR=$(command -v mkdir) MKDIR=$(command -v mkdir)
CHROOT=$(command -v chroot) CHROOT=$(command -v chroot)
exec env -i "NPROC=$NPROC" unshare -nrm bash -uexs <<EOF # exec env -i "NPROC=$NPROC" unshare -nrm bash -uexs <<EOF
exec env -i "NPROC=$NPROC" bash -uexs <<EOF
$MKDIR stage/dev; :> stage/dev/null $MKDIR stage/dev; :> stage/dev/null
$MOUNT --bind /dev/null stage/dev/null $MOUNT --bind /dev/null stage/dev/null

3
06/helpers/chroot
View file

@ -15,4 +15,5 @@
set -uex set -uex
exec unshare -nrm helpers/chroot-inner "$@" # exec unshare -nrm helpers/chroot-inner "$@"
exec helpers/chroot-inner "$@"

4
06/helpers/maint/build-custom-stage5
View file

@ -36,7 +36,7 @@ rm -f "$DESTDIR/store/5-go-beyond-using-nix/ZilchOS-core.iso"
# Inject ccache data, all stage5 ccache data we can find # Inject ccache data, all stage5 ccache data we can find
if [[ "${USE_CCACHE-}" = 1 ]]; then if [[ "${USE_CCACHE-}" = 1 ]]; then
helpers/inject "$DESTDIR" pkgs/_2a0-ccache.pkg helpers/inject "$DESTDIR" pkgs/_2a0-ccache.pkg
unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -z # unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -z
if [[ -e tmp/ccache/5-go-beyond-using-nix.tar.zstd ]]; then if [[ -e tmp/ccache/5-go-beyond-using-nix.tar.zstd ]]; then
tar -Izstd -xf tmp/ccache/5-go-beyond-using-nix.tar.zstd \ tar -Izstd -xf tmp/ccache/5-go-beyond-using-nix.tar.zstd \
-C "$DESTDIR/ccache" -C "$DESTDIR/ccache"
@ -74,7 +74,7 @@ tar -Izstd -cf "pkgs/custom-stage5.pkg" \
# Collect ccache back # Collect ccache back
if [[ "${USE_CCACHE-}" = 1 ]]; then if [[ "${USE_CCACHE-}" = 1 ]]; then
unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -sz # unshare -nr chroot "$DESTDIR" /store/_2a0-ccache/bin/ccache -sz
tar -Izstd -cf "tmp/ccache/custom-stage5.tar.zstd" \ tar -Izstd -cf "tmp/ccache/custom-stage5.tar.zstd" \
-C "$DESTDIR/ccache" . -C "$DESTDIR/ccache" .
fi fi