bootstrap-initrd

commit: b311c5bbf974c29f81a29b3b2b26a59c39fdf9b2
parent 064f8b390793f4dffbc45ee0ad50a85b4daa20c8
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Fri,  7 Jun 2024 16:17:52 +0200

Bump to utils-std 726b168

Most notably:
- Switch from makeless.sh to a simpler bootstrap.sh

- mv: Use basename on destdir targets
- mv: Skip same files
- head: Historical -num
- lib/mode: Fix applying SET operator

Diffstat:
M
distfiles.SHA512SUM
2
+-
M
fetch.sh
2
+-
M
init.sh
28
++++++++++++----------------
M
make-root.sh
4
+++-

4 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -70,7 +70,7 @@ ede1616d9892b2ca1fdb332a4329ac26f544321620cae1abc73bea13c79120599e7bc626296494ef
 b932d4c4d05193a4c68370607234f3d77ce0fba93aadf6323529ad6aa56e51b38309c0d85870a040baac704eb30807a71e6510351e8893fbd2aa7b1265027ecc  distfiles/tcc-libs-static-0.9.27_git20240117-r0.apk.x86
 b89b489fbee7c19a21175ad61168d250856801175fa000261b35202312148ee8e7b6cb1994d042503ad36f2651ee1ba68c4f83d96051abb50fb4e0e5dbc78960  distfiles/tcc-libs-static-0.9.27_git20240117-r0.apk.x86_64
 ccb62313eaf2fb149ba3a372ab6a0cccde2fc23e2193843f457b9ed181b832fddb34fe23b18ec3005aefb7d1137fcb440fb57462b9414734f3b1a90183d3db36  distfiles/tiny-curl-8.4.0.tar.gz
-9cb185d960716985227201d31a922bbe8d12ddf65907f7bdea8359e755dcd54ba523349d5ac9002ef1c25e183b0b6a24f58f74c131f59ed6c68166ffebe7b2c0  distfiles/utils-std-5c8c4b1.tar.gz
+6a3c8132118cb304d5d2da9cc26d01b7f7bd388ebf49710a5ca7568a58c18d1d63760518dd4b1336f9b6f594d952eb68d18aa01d54bef8a096eddff033a5fd50  distfiles/utils-std-726b168.tar.gz
 c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82  distfiles/xz-5.6.2.tar.gz
 e186a8fc01871414574fd5e90e8ce87a45bcf40aa0d7276bd90a301ee8c312be3a0adb580fc2c8b6653fbeeda1ce4dfdd078095a5fc77e70263e5e940414dc54  distfiles/yacc-oyacc-6.6.tar.gz
 580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f  distfiles/zlib-1.3.1.tar.gz
diff --git a/fetch.sh b/fetch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 URLS="
-	https://hacktivis.me/releases/utils-std/utils-std-5c8c4b1.tar.gz
+	https://hacktivis.me/releases/utils-std/utils-std-726b168.tar.gz
 	https://frippery.org/make/pdpmake-1.4.2.tgz
 	https://gitlab.com/bzip2/bzip2/-/archive/bzip2-1.0.8/bzip2-bzip2-1.0.8.tar.gz
 	https://zlib.net/zlib-1.3.1.tar.gz
diff --git a/init.sh b/init.sh
@@ -109,12 +109,18 @@ build_hierloom() {
 }
 
 build_utils_std() {
-	# Proper install so you get /usr/bin/env
 	cd /utils-std-*/
-	MAKE=pdpmake ./configure PREFIX=/usr
-	pdpmake
-	pdpmake install
-	pdpmake clean
+	oldpath="$PATH"
+	export PATH="$PATH:$PWD/cmd/"
+
+	loksh ./bootstrap.sh || die
+	MAKE=pdpmake loksh ./configure PREFIX=/usr M4=true || die
+	rm cmd/cat cmd/printf cmd/tr || die
+	pdpmake || die
+	pdpmake install || die
+	pdpmake clean || die
+
+	export PATH="$oldpath"
 }
 
 build_sbase_sed() {
@@ -157,21 +163,11 @@ build_stubs || die
 
 build_pdpmake || die
 
-cd /utils-std-*/ || die
-M4=true loksh ./makeless.sh || die
-
-oldpath="$PATH"
-PATH="$(echo /utils-std-*/cmd/):$oldpath"
-
-ln -s loksh /bin/sh || die "Failed creating /bin/sh symlink"
+build_utils_std || die
 
 # needs: make cat $CC $YACC rm mv $AR true test install mkdir
 build_hierloom_devtools || die
 
-build_utils_std || die
-
-PATH="$oldpath"
-
 cat >/bin/hostname <<'EOF'
 #!/bin/sh
 exec uname -n
diff --git a/make-root.sh b/make-root.sh
@@ -7,7 +7,7 @@ tarballs="
 	lolibc-f6e9da7.tar.gz
 	loksh-7.5.tar.gz
 	yacc-oyacc-6.6.tar.gz
-	utils-std-5c8c4b1.tar.gz
+	utils-std-726b168.tar.gz
 	pdpmake-1.4.2.tgz
 	nawk-20240422.tar.gz
 	bzip2-bzip2-1.0.8.tar.gz
@@ -136,6 +136,8 @@ sed -i -e '1a#include <limits.h>' -e 's;_PW_NAME_LEN;LOGIN_NAME_MAX;' loksh-*/ma
 
 gen_loksh_tcc_h > loksh_tcc.h
 
+ln -s loksh bin/sh
+
 oyacc=$(echo ./yacc-oyacc-*/)
 cat >"${oyacc}/config.h" <<EOF
 // __dead and __dead2 are absent in musl