bootstrap-initrd

commit: 4a81b1523a218127576c41f4db3f28551140c65e
parent 62a8a667888d665d6d244094bd4521d1574f3b0b
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Thu,  2 May 2024 18:19:40 +0200

Get m4 from heirloom-devtools

Diffstat:
M
README.md
6
++++++
M
distfiles.SHA512SUM
1
-
M
fetch.sh
2
+-
M
init.sh
2
+-
M
make-root.sh
1
-

5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -79,6 +79,12 @@ Slighly messy Makefiles but only has few dependencies.
 Meanwhile:
 - flex: ./configure script which requires diff(1) for it's grep sanity check
 
+### Heirloom-devtools m4
+Slighly messy Makefiles but only has few dependencies.  
+Meanwhile:
+- GNU m4: Not even close
+- OpenBSD m4 aka om4: Requires a more modern lex than heirloom-devtools provides
+
 ## Launching in QEMU
 ```
 $ qemu-system-x86_64 -enable-kvm -m 512 -kernel /boot/vmlinuz-6.6.21-gentoo -initrd /tmp/initramfs-tcc-x86_64.cpio.xz -append 'init=/init console=ttyS0 panic=1' -nographic -no-reboot
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -24,7 +24,6 @@ d74d86400cb5a772f8652d3c08fd041ae7999475eeef500aa8bca6c11109389d6604764184136a4b
 05d97e8c9f1428e5d391bcaa010f0883997f955d302531b602b943732e474aac534b671d6a20792894432c9eef1de94c8fd4e319449e655e83e166eee5a02f33  distfiles/musl-libintl-1.2.5-r0.apk.x86
 dacee8ce46c236fcc09ae767bd2f1bc1dfcba026a49134cb8f915d2d4ad31eb089fc8edeb8b1027276a9450ca14be56043747c93acbcbab334efa1bd20069084  distfiles/musl-libintl-1.2.5-r0.apk.x86_64
 3d5626b0d6033a9eb8f3d81acbe0b30842e99f4c40563ca3f906ecfebdb72d754de18cd180345131868ad325fead4a6e66bfb765af45267180e256f46a76f316  distfiles/nawk-20240422.tar.gz
-a64d6dcf3f4319cf40af684d0775f8c7e3a21e07a5262fc83b588bf7ea85f2e91d2d171307c93734799af59e1dc50c498543356c78cbaf7fb721a14f71f128c2  distfiles/om4-6.7.tar.gz
 ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f  distfiles/pigz-2.8.tar.gz
 991f742ead7dcfd063b7e9bdc5d604353da76038729b599a597e6dd55ba7c9f4dd1df5f508f8b42a1c8b41e711301d772a69f015917c4c4ec678717784efc714  distfiles/tcc-0.9.27_git20240117-r0.apk.aarch64
 41c4bfcd5b68a236ead6910cc28edcc47775f0221f032bae33f67239342c08a12405da8c32e5f3fb25c4d57af4005a359526d0854284787331fd1f2183d30d75  distfiles/tcc-0.9.27_git20240117-r0.apk.armhf
diff --git a/fetch.sh b/fetch.sh
@@ -41,7 +41,7 @@ do
 done
 
 # Only has ./CVS and .travis-ci.yml removed compared to Github autogenerated tarball
-test -e om4-6.7.tar.gz || curl ${CURL_OPTS} -o om4-6.7.tar.gz https://github.com/ibara/m4/releases/download/om4-6.7/om4-6.7.tar.gz
+#test -e om4-6.7.tar.gz || curl ${CURL_OPTS} -o om4-6.7.tar.gz https://github.com/ibara/m4/releases/download/om4-6.7/om4-6.7.tar.gz
 
 test -e nawk-20240422.tar.gz || curl ${CURL_OPTS} -o nawk-20240422.tar.gz https://github.com/onetrueawk/awk/archive/20240422.tar.gz
 
diff --git a/init.sh b/init.sh
@@ -79,7 +79,7 @@ build_pigz() {
 
 build_hierloom_devtools() {
 	cd /heirloom-devtools-*/
-	for cmd in lex
+	for cmd in lex m4
 	do
 		bmake "$cmd/Makefile"
 		bmake AR=true RANLIB=true -C "$cmd"
diff --git a/make-root.sh b/make-root.sh
@@ -101,7 +101,6 @@ patch -p0 <"${WORKDIR}/zlib-1.3.1-use-LDFLAGS-in-configure_no_gcc.patch"
 sed -i \
 	-e 's;INSTALL=.*;INSTALL=install;' \
 	-e 's;PREFIX=.*;PREFIX=/usr;;' \
-	-e 's;SUSBIN=.*;SUSBIN=$(BINDIR);' \
 	-e 's;STRIP=.*;STRIP=true;' \
 	-e 's;#?AR=.*;AR ?= ar;' \
 	-e 's;RANLIB=.*;RANLIB ?= ranlib;' \