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/module/cbutils       | 6 +++---
 resources/scripts/build/module/flashrom      | 2 +-
 resources/scripts/build/module/grub          | 2 +-
 resources/scripts/build/module/ich9utils     | 2 +-
 resources/scripts/build/module/memtest86plus | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/resources/scripts/build/module/cbutils b/resources/scripts/build/module/cbutils
index 526467bd..b362ee7a 100755
--- a/resources/scripts/build/module/cbutils
+++ b/resources/scripts/build/module/cbutils
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: build various coreboot utilities
 #
@@ -44,7 +44,7 @@ build_for_mainboard() {
 	[ ! -f "resources/coreboot/${board}/board.cfg" ] && \
 		continue
 	cbtree="undefined"
-	source "resources/coreboot/${board}/board.cfg" # source
+	. "resources/coreboot/${board}/board.cfg" # source
 	if [ "${cbtree}" = "undefined" ]; then
 		printf "build/cbutils: improper cbtree definition for '%s'" \
 				"${board}"
@@ -58,7 +58,7 @@ buildutils() {
 	if [ ! -d "coreboot/${cbtree}/" ]; then
 		./download coreboot $cbtree || return 1
 	fi
-	for util in {cbfs,ifd}tool; do
+	for util in cbfstool ifdtool; do
 		make -j$(nproc) -BC "coreboot/${cbtree}/util/${util}/" \
 				|| return 1
 	done
diff --git a/resources/scripts/build/module/flashrom b/resources/scripts/build/module/flashrom
index c1641d94..37f57ce0 100755
--- a/resources/scripts/build/module/flashrom
+++ b/resources/scripts/build/module/flashrom
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: builds flashrom source code
 #
diff --git a/resources/scripts/build/module/grub b/resources/scripts/build/module/grub
index 4d2009ed..5cf58a67 100755
--- a/resources/scripts/build/module/grub
+++ b/resources/scripts/build/module/grub
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: builds GRUB2 source code
 #
diff --git a/resources/scripts/build/module/ich9utils b/resources/scripts/build/module/ich9utils
index 5a9fbe4b..5473a513 100755
--- a/resources/scripts/build/module/ich9utils
+++ b/resources/scripts/build/module/ich9utils
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: build ich9utils
 #
diff --git a/resources/scripts/build/module/memtest86plus b/resources/scripts/build/module/memtest86plus
index f57b7c57..7fc46be9 100755
--- a/resources/scripts/build/module/memtest86plus
+++ b/resources/scripts/build/module/memtest86plus
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #  helper script: builds memtest86+ source code
 #
-- 
cgit v1.2.1