bootstrap-initrd

commit: 66ff9c14a42fcfbfe99d242e85aff1ffc91c55b0
parent 2f86355a71468c07a47a4ede96d6597edf7337b3
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Thu,  2 May 2024 13:39:36 +0200

Avoid xz tarballs

Diffstat:
M
distfiles.SHA512SUM
5
+++--
M
fetch.sh
6
+++---
M
make-root.sh
10
+++++++---

3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -1,7 +1,8 @@
 50622aee8024b3e0385974a8f446a4b5df0ba494b6133ab91ebbe63c408154b112f62c9df8521f4f1beaf28cdd6e7da178c3334337f6b14c8bced532029d8ba5  distfiles/bmake-20230909.tar.gz
 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3  distfiles/bzip2-1.0.8.tar.gz
 1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055  distfiles/heirloom-devtools-070527.tar.bz2
-a054917c975f65dfb5f8eb35665044ddacacdbd2d1e1113e6bf62d5cd8d5f4fd775ff5f20e28191d2417016684a310f23115af102b834aa33083e2be41034477  distfiles/loksh-7.3.tar.xz
+3e23929f6ead271a8918224e7979d4168214d47603ef22d9b3391686b4de72a48b261632924a2b9f0c8c58da790401309dd5304c100d8bcbe4ec8c0a434b7d95  distfiles/loksh-7.3.tar.gz
+5e812dcbfb5a1be294a3717ed54c5758c9836bd133e56ee59600f47531f1d8536c613b1548637620a4f4cc2761ba507fa541273d1f03108b60cb0c883c601891  distfiles/lolibc-f6e9da7.tar.gz
 9d81ba58f5460e341d9de7c4b2af38c7bf39ae40fdcfac1652e7ad64bd903d58222128880daeb30ef5c1726a244d815ab9c7b22b9cb92c7aeaaa7728f29c4116  distfiles/minised-1.16.tar.gz
 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b  distfiles/mk-20210330.tar.gz
 dddd12728842e84bf7d532901d9b9e26e2c8c86e25a3625329586c9088ec9b3825ce3e512c56b7e875b923905308b89494d31d7ca05ebda5485bd00de3954236  distfiles/musl-1.2.5-r0.apk.aarch64
@@ -51,4 +52,4 @@ b932d4c4d05193a4c68370607234f3d77ce0fba93aadf6323529ad6aa56e51b38309c0d85870a040
 b89b489fbee7c19a21175ad61168d250856801175fa000261b35202312148ee8e7b6cb1994d042503ad36f2651ee1ba68c4f83d96051abb50fb4e0e5dbc78960  distfiles/tcc-libs-static-0.9.27_git20240117-r0.apk.x86_64
 22b80f64dc143f5025a23288a492ade56a7907ebd20012a1f25a8387f8e92ebb8938932de571cb461acb46dba9e4c21e8b1a59585106387d818d0f49add0c041  distfiles/utils-std-bdb79c4.tar.gz
 6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80  distfiles/yacc-1.9.1.tar.Z
-1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d  distfiles/zlib-1.3.1.tar.xz
+580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f  distfiles/zlib-1.3.1.tar.gz
diff --git a/fetch.sh b/fetch.sh
@@ -6,7 +6,7 @@ URLS="
 	http://dl.exactcode.de/oss/minised/minised-1.16.tar.gz
 	https://distfiles.gentoo.org/distfiles/ec/yacc-1.9.1.tar.Z
 	https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
-	https://zlib.net/zlib-1.3.1.tar.xz
+	https://zlib.net/zlib-1.3.1.tar.gz
 	https://www.zlib.net/pigz/pigz-2.8.tar.gz
 	https://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070527/heirloom-devtools-070527.tar.bz2
 "
@@ -45,8 +45,8 @@ test -e om4-6.7.tar.gz || curl ${CURL_OPTS} -o om4-6.7.tar.gz https://github.com
 
 test -e nawk-20240422.tar.gz || curl ${CURL_OPTS} -o nawk-20240422.tar.gz https://github.com/onetrueawk/awk/archive/20240422.tar.gz
 
-# TODO: Sanity check between provided tarball and github-generated tarball
-test -e loksh-7.3.tar.xz || curl ${CURL_OPTS} -o loksh-7.3.tar.xz https://github.com/dimkr/loksh/releases/download/7.3/loksh-7.3.tar.xz
+test -e loksh-7.3.tar.gz || curl ${CURL_OPTS} -o loksh-7.3.tar.gz https://github.com/dimkr/loksh/archive/refs/tags/7.3.tar.gz
+test -e lolibc-f6e9da7.tar.gz || curl ${CURL_OPTS} -o lolibc-f6e9da7.tar.gz https://github.com/dimkr/lolibc/archive/f6e9da7.tar.gz
 
 cd -
 
diff --git a/make-root.sh b/make-root.sh
@@ -4,15 +4,16 @@
 # SPDX-License-Identifier: MPL-2.0
 
 tarballs="
+	lolibc-f6e9da7.tar.gz
+	loksh-7.3.tar.gz
 	utils-std-bdb79c4.tar.gz
 	mk-20210330.tar.gz
 	bmake-20230909.tar.gz
 	minised-1.16.tar.gz
 	yacc-1.9.1.tar.Z
 	nawk-20240422.tar.gz
-	loksh-7.3.tar.xz
 	bzip2-1.0.8.tar.gz
-	zlib-1.3.1.tar.xz
+	zlib-1.3.1.tar.gz
 	pigz-2.8.tar.gz
 	heirloom-devtools-070527.tar.bz2
 "
@@ -30,7 +31,10 @@ gen_loksh_tcc_h() {
 	cd loksh-*/ || die
 	printf 'char *loksh_tcc_cmd[] = {'
 	# -DSMALL to not need ncurses
-	printf '"%s", ' /usr/bin/tcc -D_GNU_SOURCE -DEMACS -DVI -DSMALL -DHAVE_STRLCPY -DHAVE_STRLCAT -DHAVE_ISSETUGID -I./subprojects/lolibc/include/ -o /bin/loksh *.c subprojects/lolibc/sys_signame.c subprojects/lolibc/strsignals.c subprojects/lolibc/unvis.c subprojects/lolibc/vis.c subprojects/lolibc/strtonum.c
+	printf '"%s", ' /usr/bin/tcc -o /bin/loksh \
+		-D_GNU_SOURCE -DEMACS -DVI -DSMALL -DHAVE_STRLCPY -DHAVE_STRLCAT -DHAVE_ISSETUGID \
+		-I ../lolibc-*/include/ *.c \
+		../lolibc-*/sys_signame.c ../lolibc-*/strsignals.c ../lolibc-*/unvis.c ../lolibc-*/vis.c ../lolibc-*/strtonum.c
 	printf 'NULL};'
 	cd "$out_base" || die "Failed: cd $out_base"
 }