From 2e38ddaa9bb0a8d9e0657cd5b20b796ff02a0abe Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 13 Jun 2023 12:09:01 +0100
Subject: 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.
---
 resources/scripts/build/boot/roms        | 15 ++++++++-------
 resources/scripts/build/boot/roms_helper | 26 ++++++++++++++------------
 2 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'resources/scripts/build/boot')

diff --git a/resources/scripts/build/boot/roms b/resources/scripts/build/boot/roms
index 07f92a83..f0398273 100755
--- a/resources/scripts/build/boot/roms
+++ b/resources/scripts/build/boot/roms
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #
 #  helper script: build coreboot images with various payloads
@@ -7,6 +7,7 @@
 #							<info@minifree.org>
 #	Copyright (C) 2015 Klemens Nanni <contact@autoboot.org>
 #	Copyright (C) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+#	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
@@ -30,7 +31,7 @@ set -u -e
 
 projectname="$(cat projectname)"
 opts=""
-boards=""
+boards=
 firstoption="${1}"
 
 main()
@@ -49,19 +50,19 @@ main()
 		exit 0
 	fi
 
-	while [[ $# > 0 ]]; do
+	while [ $# -gt 0 ]; do
 		case ${1} in
 			-d)
-			opts+=" -d ${2}"
+			opts="${opts} -d ${2}"
 			shift ;;
 			-p)
-			opts+=" -p ${2}"
+			opts="${opts} -p ${2}"
 			shift ;;
 			-k)
-			opts+=" -k ${2}"
+			opts="${opts} -k ${2}"
 			shift ;;
 			*)
-			boards+=" ${1} " ;;
+			boards="${boards} ${1} " ;;
 		esac
 		shift
 	done
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index c5cb5df4..02d8f61f 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -1,9 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: create ROM images for a given mainboard
 #
 #	Copyright (C) 2020,2021,2023 Leah Rowe <info@minifree.org>
-#	Copyright (C) 2021 Ferass El Hafidi <vitali64pmemail@protonmail.com>
+#	Copyright (C) 2021,2022 Ferass El Hafidi
+#				<vitali64pmemail@protonmail.com>
 #	Copyright (C) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 #	Copyright (C) 2022 Alper Nebi Yasak <alpernebiyasak@gmail.com>
 #
@@ -63,16 +64,16 @@ CROSS_COMPILE=""
 
 main()
 {
-	while [[ $# > 0 ]]; do
+	while [ $# -gt 0 ]; do
 		case ${1} in
 			-d)
-			displaymodes+="${2}" 
+			displaymodes="${displaymodes}${2}" 
 			shift ;;
 			-p)
-			payloads+="${2}"
+			payloads="${payloads}${2}"
 			shift ;;
 			-k)
-			keyboard_layouts+="${2}"
+			keyboard_layouts="${keyboard_layouts}${2}"
 			shift ;;
 			*)
 			board=${1} ;;
@@ -107,7 +108,7 @@ load_config()
 		exit 1
 	fi
 
-	source "${boardcfgdir}/board.cfg"
+	. "${boardcfgdir}/board.cfg"
 
 	if [ "${board}" != "${cbtree}" ]; then
 		cbdir="coreboot/${cbtree}"
@@ -554,11 +555,11 @@ mkRomsWithGrub()
 	keymaps=""
 	if [ -z ${keyboard_layouts} ]; then
 		for kmapfile in "${kmapdir}"/*; do
-			keymaps+=" ${kmapfile}"
+			keymaps="${keymaps} ${kmapfile}"
 		done
 	else
 		for keymapname in ${keyboard_layouts}; do
-			keymaps+=" ${kmapdir}/${keymapname}.gkb"
+			keymaps="${keymaps} ${kmapdir}/${keymapname}.gkb"
 		done
 	fi
 	for keymapfile in ${keymaps}; do
@@ -694,10 +695,11 @@ moverom()
 
 	if [ "${cuttype}" = "i945 laptop" ]; then
 		dd if=${_newrom} of=top64k.bin bs=1 \
-				skip=$[$(stat -c %s ${_newrom}) - 0x10000] \
+				skip=$(($(stat -c %s ${_newrom}) - 0x10000)) \
 				count=64k
-		dd if=top64k.bin of=${_newrom} bs=1 seek=$[$(stat -c %s \
-				${_newrom}) - 0x20000] count=64k conv=notrunc
+		dd if=top64k.bin of=${_newrom} bs=1 \
+				seek=$(($(stat -c %s ${_newrom}) - 0x20000)) \
+				count=64k conv=notrunc
 		rm -f top64k.bin
 		return 0
 	fi
-- 
cgit v1.2.1