Revert "Remove most of Ferass's lbmk contributions"

This reverts commit a4ea2867319471d9fe7d4ee540881e0286b4d3cf.

The licensing audit has been abandoned. I will not be re-licensing
in bulk to MIT.

I can still use MIT license on new works, e.g. utilities, but there's
really no pressing need to re-license lbmk. It's just shell scripts,
and most of what it interacts with (coreboot, grub, seabios) is GPL
anyway.

So who cares?

Ferass's patch was removed due to refusal to re-license, but the
decision to re-license has been canceled.

I'm now aiming for a quick stable release.

3 files changed, 15 insertions, 6 deletions

diff --git a/resources/scripts/build/payload/grub b/resources/scripts/build/payload/grub
index 7569fd86..23765f47 100755
--- a/resources/scripts/build/payload/grub
+++ b/resources/scripts/build/payload/grub
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #   generate GRUB ELF files (coreboot payload) and configuration files
 #
@@ -24,7 +24,7 @@ set -u -e
 grubcfgsdir="resources/grub"
 keymap=""
 
-source "${grubcfgsdir}/modules.list"
+. "${grubcfgsdir}/modules.list"
 
 main()
 {
diff --git a/resources/scripts/build/payload/seabios b/resources/scripts/build/payload/seabios
index ed31e3bb..f822a019 100755
--- a/resources/scripts/build/payload/seabios
+++ b/resources/scripts/build/payload/seabios
@@ -1,8 +1,9 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: builds SeaBIOS source code
 #
 #	Copyright (C) 2020, 2021, 2023 Leah Rowe <info@minifree.org>
+#	Copyright (C) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -36,7 +37,9 @@ main()
 	done
 
 	# clean it again. gotta keep it clean!
-	[[ -f Makefile ]] && make -C seabios distclean
+	if [ -f seabios/Makefile ]; then
+		make distclean -BC seabios || exit 1
+	fi
 
 	printf "Done! SeaBIOS files are in %s/\n\n" ${payloaddir}
 }
diff --git a/resources/scripts/build/payload/u-boot b/resources/scripts/build/payload/u-boot
index bc1cf997..bff41400 100755
--- a/resources/scripts/build/payload/u-boot
+++ b/resources/scripts/build/payload/u-boot
@@ -3,6 +3,7 @@
 #  helper script: builds U-Boot source code
 #
 #	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com>
+#	Copyright (C) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
 #	Copyright (C) 2023 Leah Rowe <leah@libreboot.org>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -96,7 +97,7 @@ handle_dependencies()
 	fi
 
 	# Override the above defaults using board.cfg
-	source "${board_dir}/board.cfg" # source
+	. "${board_dir}/board.cfg" # source
 
 	if [ "${ubtree}" = "undefined" ]; then
 		printf "build/u-boot %s: ubtree undefined\n" \
@@ -161,7 +162,12 @@ build_uboot_elf()
 	make -C "${ubdir}" olddefconfig
 	make -C "${ubdir}" -j"$(nproc)" all
 
-	for f in "${ubdir}"/u-boot{,.bin,.dtb,.img,.itb,.elf}; do
+	for f in "${ubdir}"/u-boot "${ubdir}"/u-boot.bin \
+			"${ubdir}"/u-boot.dtb \
+			"${ubdir}"/u-boot.img \
+			"${ubdir}"/u-boot.itb \
+			"${ubdir}"/u-boot.elf
+	do
 		if [ -f "$f" ]; then
 			mv "$f" "${dest_dir}/"
 		fi