bootstrap-initrd

commit: 2dcbe2e1d263b4357440efd465c8db5da0eccbcb
parent 30039cc883c686b790783efd396fd187990706f6
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue,  4 Feb 2025 14:40:22 +0100

Switch git to 2.48.1 snapshot and use muon

Diffstat:
M
distfiles.SHA512SUM
2
+-
M
extras-build-all.sh
2
+-
M
extras/git.sh
20
+++++++++++++++-----
M
fetch.sh
2
+-
M
make-root.sh
2
+-

5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -3,7 +3,7 @@ f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4
 26c6fa1ac7bcfd523f9ab9e6c2d971103ccfc610ad0df504d4e9b064dad74576d77240c052b808f4c37c9240302a7e973a20f79ee39ac7bf3201a6fa9f0dfa96  distfiles/cacert-2024-11-26.pem
 0f2281a92acb8bba2136ef8d9b074ac5217c4b6f1d0bf26e2cd5e9e9426abfa3b01cee044a83c6bc1b3e531487d508a032ab68b819a6753adbacaaf8311059d9  distfiles/e2fsprogs-1.47.1.tar.gz
 0ed85599c8dc4114764b8eeed1e35cde97f11185c3f689e377d020758cc010ba4402febb84dba4cdc78e94fa2cd65614dafade8708ea078db5b2921925c36e78  distfiles/gettext-tiny-0.3.2.tar.gz
-44904d0981ea795bc2681af8c1d8a7ffcb1da25c73939d8a2126d3df164c1a214647d1f3905ad22b3162298741fc95689ba6be393fe8d31f88e2d3a8f833ad64  distfiles/git-2.45.2.tar.gz
+b73e76e5f492f0cd6a595fe4d07cb2b8200902341efe498479a00e92fa18b9b1cbf49c4f844e9917ba0332d7fbaf989d39588620bdc8a0b6de6e8c4a9a786bf6  distfiles/git-2.48.1.tar.gz
 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9  distfiles/heirloom-070715.tar.bz2
 1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055  distfiles/heirloom-devtools-070527.tar.bz2
 5d02341cb0d1238f5b974401671c19e7a7f89596e18c26e356b8982a474c8a0f2e851d321aa41be252aea183a778cbf00806dc981a70c20650ecb26f0f69ce0e  distfiles/iproute2-6.12.0.tar.gz
diff --git a/extras-build-all.sh b/extras-build-all.sh
@@ -18,4 +18,4 @@ set -ex
 
 /extras/iproute2.sh # make pkgconf
 
-/extras/git.sh # make tiny-curl gettext-tiny
+/extras/git.sh # muon-stage2 tiny-curl
diff --git a/extras/git.sh b/extras/git.sh
@@ -8,15 +8,25 @@ die() {
 
 command -v make || die "Run /extras/make.sh"
 command -v curl || die "Run /extras/tiny-curl.sh"
-command -v msgfmt || die "Run /extras/gettext-tiny.sh"
 
 tar xof /distfiles/git-*.tar.gz
 cd git-*/
 
-LD=$CC ./configure --prefix=/usr --with-curl
-unset MAKE
-make
-make install INSTALL=install
+export LD=$CC
+
+muon setup \
+	-Dprefix=/usr \
+	-Dperl=disabled \
+	-Dtests=false \
+	-Dgitweb=disabled \
+	-Dpcre2=disabled \
+	-Dcurl=enabled \
+	-Dexpat=disabled \
+	-Dgettext=disabled \
+	build
+
+muon -C build samu
+muon -C build install
 
 cd ..
 rm -fr git-*/
diff --git a/fetch.sh b/fetch.sh
@@ -15,7 +15,7 @@ URLS="
 	https://bearssl.org/bearssl-0.6.tar.gz
 	https://curl.se/tiny/tiny-curl-8.4.0.tar.gz
 	https://curl.haxx.se/ca/cacert-2024-11-26.pem
-	https://www.kernel.org/pub/software/scm/git/git-2.45.2.tar.gz
+	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
 "
diff --git a/make-root.sh b/make-root.sh
@@ -34,7 +34,7 @@ distfiles="
 	tiny-curl-8.4.0.tar.gz
 	cacert-2024-11-26.pem
 	gettext-tiny-0.3.2.tar.gz
-	git-2.45.2.tar.gz
+	git-2.48.1.tar.gz
 	e2fsprogs-1.47.1.tar.gz
 	muon-v0.3.1.tar.gz
 "