bootstrap-initrd

commit: 6bbe74a161b33d1eb625cf0ded1a5bf4ae82a88a
parent b91658d7b66267d8a6ad1fe2c28bf1f434922a12
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Wed, 19 Feb 2025 00:57:35 +0100

distfiles: bump muon to v0.4.0

Diffstat:
M
distfiles.SHA512SUM
2
+-
M
extras/muon-stage1.sh
14
+++-----------
M
extras/muon-stage2.sh
14
+++-----------
M
fetch.sh
2
+-
M
make-root.sh
2
+-

5 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -14,7 +14,7 @@ e713445dbd824189e3fdf0b07bf61585372b4d3bd4b87dce8dca1125baadd3681ab5be7dfec203c0
 27eebbe44aae1bd4fe08aacda463d50e49e1133964ab13ef2061bdac14851b21936d04a874d2c43fc16a3c5d52c3d6b7621960bd9e393808389795212a2ed2b3  distfiles/linux-headers-6.12.6-r0.apk.x86_64
 d90c6903355ee1309cb0d92a8a024522ff049091a117ea21efb585b5de35776191cd67d17a65b18c2f9d374795b7c944f047576f0e3fe818d094b26f0e4845c5  distfiles/lua-5.4.6.tar.gz
 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c  distfiles/make-4.4.1.tar.gz
-a43780ec3e3f43f03909725b7de6e9277ed30701703d7b19c7e4c349b30ab97dadb629de7638e6d0cab5a3a33f8bffad63c733c41edcdcdad60fcf5adea26965  distfiles/muon-v0.3.1.tar.gz
+2ab817bfe886fff5a9cd00935f19c7c73cc4556aa11a538ca496bdad4cced4dc1608efd05d58b6971640d0543bd7d4486185ed93a26522690cf2e1d348342bb8  distfiles/muon-v0.4.0.tar.gz
 8276aa0ce7368b87bf97f37d600639d475c059b984061125c6b648d2fecb838d87c8de9f19af32bad5862845c05368ccec0b328af3beb0fedc89a7ec0fb3babb  distfiles/musl-1.2.5-r10.apk.aarch64
 18e90cbe16c8084cbf8d91b36decde0d520778946258d4c84908e639741843d21b7e9e610f007e5126dcc6a3ba2289a862bc18cfd9b21d3bc64161483a5704cf  distfiles/musl-1.2.5-r10.apk.armhf
 4c76e3c4e94ab96d49c51ad01205e846280f851cff06b8c6ab8269d2ac99bbede29da9600fa60130c266d95da21bccdb00ad4b18123964774835e8014611e53e  distfiles/musl-1.2.5-r10.apk.riscv64
diff --git a/extras/muon-stage1.sh b/extras/muon-stage1.sh
@@ -6,19 +6,11 @@ cd muon-*/
 
 ./bootstrap.sh bootstrap
 
-# Equivalent to commit 74174cbb3e9e1386982b18ffd0ab0e4fe72c98b2
-ed ./tests/project/meson.build <<EOF
-/meson_tests_dir =/
-m-2
-w
-q
-EOF
-
 export LD=$CC
 
-./bootstrap/muon setup -Dprefix=/usr build
-./bootstrap/muon -C build samu
-./bootstrap/muon -C build install
+./bootstrap/muon-bootstrap setup -Dprefix=/usr build
+./bootstrap/muon-bootstrap -C build samu
+./bootstrap/muon-bootstrap -C build install
 
 cd ..
 rm -r ./muon-*/
diff --git a/extras/muon-stage2.sh b/extras/muon-stage2.sh
@@ -15,25 +15,17 @@ cd muon-*/
 # needs to re-bootstrap to get a muon which uses libpkgconf
 ./bootstrap.sh bootstrap
 
-# Equivalent to commit 74174cbb3e9e1386982b18ffd0ab0e4fe72c98b2
-ed ./tests/project/meson.build <<EOF
-/meson_tests_dir =/
-m-2
-w
-q
-EOF
-
 export LD=$CC
 
-./bootstrap/muon setup \
+./bootstrap/muon-bootstrap setup \
 	-Dprefix=/usr \
 	-Dlibcurl=disabled \
 	-Dlibarchive=disabled \
 	-Dlibpkgconf=enabled \
 	build
 
-./bootstrap/muon -C build samu
-./bootstrap/muon -C build install
+./bootstrap/muon-bootstrap -C build samu
+./bootstrap/muon-bootstrap -C build install
 
 cd ..
 rm -r ./muon-*/
diff --git a/fetch.sh b/fetch.sh
@@ -17,7 +17,7 @@ URLS="
 	https://curl.haxx.se/ca/cacert-2024-11-26.pem
 	https://git.kernel.org/pub/scm/git/git.git/snapshot/git-2.48.1.tar.gz
 	https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.1/e2fsprogs-1.47.1.tar.gz
-	https://muon.build/releases/v0.3.1/muon-v0.3.1.tar.gz
+	https://muon.build/releases/v0.4.0/muon-v0.4.0.tar.gz
 	https://c9x.me/compile/release/qbe-1.2.tar.xz
 "
 WORKDIR="$(dirname "$0")"
diff --git a/make-root.sh b/make-root.sh
@@ -35,7 +35,7 @@ distfiles="
 	cacert-2024-11-26.pem
 	git-2.48.1.tar.gz
 	e2fsprogs-1.47.1.tar.gz
-	muon-v0.3.1.tar.gz
+	muon-v0.4.0.tar.gz
 	muxzcat-v2b.tar.gz
 "
 local_distfiles="