1 files changed, 198 insertions, 151 deletions

diff --git a/include/lib.sh b/include/lib.sh
index 2cd8c0d7..feb411e0 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -1,220 +1,267 @@
 # SPDX-License-Identifier: GPL-3.0-only
+
 # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# Copyright (c) 2020-2024 Leah Rowe <leah@libreboot.org>
-
-export LC_COLLATE=C
-export LC_ALL=C
+# Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org>
+# Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com>
 
-_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
-kbnotice="Insert a .gkb file from config/data/grub/keymap/ as keymap.gkb \
-if you want a custom keymap in GRUB; use cbfstool from elf/cbfstool."
+cbfstool="elf/coreboot/default/cbfstool"
+rmodtool="elf/coreboot/default/rmodtool"
 
-ifdtool="elf/ifdtool/default/ifdtool"
-cbfstool="elf/cbfstool/default/cbfstool"
-tmpgit="$PWD/tmp/gitclone"
-grubdata="config/data/grub"
-err="err_"
-
-err_()
+mkrom_tarball()
 {
-	printf "ERROR %s: %s\n" "$0" "$1" 1>&2; exit 1
+	update_xbmkver "$1"
+	mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz"
+
+	x_ rm -Rf "$1"
 }
 
-setvars()
+update_xbmkver()
 {
-	_setvars="" && [ $# -lt 2 ] && $err "setvars: too few arguments"
-	val="$1" && shift 1 && for var in $@; do
-		_setvars="$var=\"$val\"; $_setvars"
-	done; printf "%s\n" "${_setvars% }"
+	xbmk_sanitize_version
+
+	printf "%s\n" "$version" > "$1/.version" || \
+	    err "can't write '$1'" "update_xbmkver" "$@"; :
+
+	printf "%s\n" "$versiondate" > "$1/.versiondate" || \
+	    err "can't write '$versiondate'" "update_xbmkver" "$@"; :
 }
-chkvars()
+
+xbmk_sanitize_version()
 {
-	for var in $@; do
-		eval "[ -n "\${$var+x}" ] || \$err \"$var unset\""
-		eval "[ -n "\$$var" ] || \$err \"$var unset\""
-	done; return 0
+	if [ -z "$version" ]; then
+		return 0
+	fi
+
+	version="`printf "%s\n" "$version" | sed -e 's/\t//g'`"
+	version="`printf "%s\n" "$version" | sed -e 's/\ //g'`"
+	version="`printf "%s\n" "$version" | sed -e 's/\.\.//g'`"
+	version="`printf "%s\n" "$version" | sed -e 's/\.\///g'`"
+	version="`printf "%s\n" "$version" | sed -e 's/\//-/g'`"
+
+	version="${version#-}"
+
+	if [ -z "$version" ]; then
+		err "'version' empty after sanitization" \
+		    "xbmk_sanitize_version" "$@"
+	fi
 }
 
-eval `setvars "" _nogit board xbmk_parent versiondate projectsite projectname \
-    aur_notice configdir datadir version relname`
+mktarball()
+{
+	printf "Creating tar archive '%s' from directory '%s'\n" "$2" "$1"
 
-for fv in projectname projectsite version versiondate; do
-	eval "[ ! -f "$fv" ] || read -r $fv < \"$fv\" || :"
-done; chkvars projectname projectsite
+	if [ "${2%/*}" != "$2" ]; then
+		x_ xbmkdir "${2%/*}"
+	fi
 
-setcfg()
-{
-	[ $# -gt 1 ] && printf "e \"%s\" f missing && return %s;\n" "$1" "$2"
-	[ $# -gt 1 ] || \
-		printf "e \"%s\" f not && %s \"Missing config\";\n" "$1" "$err"
-	printf ". \"%s\" || %s \"Could not read config\";\n" "$1" "$err"
+	x_ tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || \
+	    err "can't make tarball '$1'" "mktarball" "$@"
 }
 
 e()
 {
-	es_t="e" && [ $# -gt 1 ] && es_t="$2"
+	es_t="e"
+
+	if [ $# -gt 1 ]; then
+		es_t="$2"
+	fi
+
 	es2="already exists"
 	estr="[ -$es_t \"\$1\" ] || return 1"
-	[ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="missing"
+
+	if [ $# -gt 2 ]; then
+		estr="[ -$es_t \"\$1\" ] && return 1"
+		es2="missing"
+	fi
 
 	eval "$estr"
+
 	printf "%s %s\n" "$1" "$es2" 1>&2
 }
 
-install_packages()
+setvars()
 {
-	[ $# -lt 2 ] && $err "fewer than two arguments"
-	eval `setcfg "config/dependencies/$2"`
+	_setvars=""
 
-	$pkg_add $pkglist || $err "Cannot install packages"
+	if [ $# -lt 2 ]; then
 
-	[ -n "$aur_notice" ] && \
-	printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; return 0
-}
-[ $# -gt 0 ] && [ "$1" = "dependencies" ] && install_packages $@ && exit 0
+		return 0
+	else
+		val="$1"
 
-id -u 1>/dev/null 2>/dev/null || $err "suid check failed (id -u)"
-[ "$(id -u)" != "0" ] || $err "this command as root is not permitted"
+		shift 1
 
-[ -z "${TMPDIR+x}" ] || [ "${TMPDIR%_*}" = "/tmp/xbmk" ] || unset TMPDIR
-[ -n "${TMPDIR+x}" ] && export TMPDIR="$TMPDIR"
+		while [ $# -gt 0 ]; do
+			printf "%s=\"%s\"\n" "$1" "$val"
+
+			shift 1
+		done
+	fi
+}
+
+# return 0 if project is single-tree, otherwise 1
+# e.g. coreboot is multi-tree, so 1
+singletree()
+{
+	( fx_ "eval exit 1 && err" find "config/$1/"*/ -type f \
+	    -name "target.cfg" ) || return 1; :
+}
 
-if [ -z "${TMPDIR+x}" ]; then
-	[ -f "lock" ] && $err "$PWD/lock exists. Is a build running?"
-	export TMPDIR="/tmp"
-	export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)"
-	touch lock || $err "cannot create 'lock' file"
-	xbmk_parent="y"
-fi
+findpath()
+{
+	if [ $# -lt 1 ]; then
+		err "findpath: No arguments provided" "findpath" "$@"
+	fi
 
-# XBMK_CACHE is a directory, for caching downloads and git repositories
-[ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$PWD/cache"
-[ -z "$XBMK_CACHE" ] && export XBMK_CACHE="$PWD/cache"
-[ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "$PWD/cache" ] && \
-    $err "cachedir is default, $PWD/cache, but it exists and is a symlink"
-[ -L "$XBMK_CACHE" ] && export XBMK_CACHE="$PWD/cache"
-[ -f "$XBMK_CACHE" ] && $err "cachedir '$XBMK_CACHE' exists but it's a file"
+	while [ $# -gt 0 ]
+	do
+		found="`readlink -f "$1" 2>/dev/null`" || return 1; :
 
-# if "y": a coreboot target won't be built if target.cfg says release="n"
-# (this is used to exclude certain build targets from releases)
-[ -z "${XBMK_RELEASE+x}" ] && export XBMK_RELEASE="n"
-[ "$XBMK_RELEASE" = "y" ] || export XBMK_RELEASE="n"
+		if [ -z "$found" ]; then
+			found="`realpath "$1" 2>/dev/null`" || \
+			    return 1
+		fi
 
-[ -z "${XBMK_THREADS+x}" ] && export XBMK_THREADS=1
-expr "X$XBMK_THREADS" : "X-\{0,1\}[0123456789][0123456789]*$" \
-    1>/dev/null 2>/dev/null || export XBMK_THREADS=1 # user gave a non-integer
+		printf "%s\n" "$found"
 
-x_() {
-	[ $# -lt 1 ] || $@ || $err "Unhandled non-zero exit: $@"; return 0
+		shift 1
+	done
 }
 
-[ -e ".git" ] || [ -f "version" ] || printf "unknown\n" > version || \
-    $err "Cannot generate unknown version file"
-[ -e ".git" ] || [ -f "versiondate" ] || printf "1716415872\n" > versiondate \
-    || $err "Cannot generate unknown versiondate file"
+pad_one_byte()
+{
+	paddedfile="`mktemp || err "mktemp pad_one_byte"`" || \
+	    err "can't make tmp file" "pad_one_byte" "$@"
 
-version_="$version"
-[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
-    version="git-$(git rev-parse HEAD 2>&1)" || version="$version_"
-versiondate_="$versiondate"
-[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
-    --pretty='%ct' HEAD)" || versiondate="$versiondate_"
-for p in projectname version versiondate projectsite; do
-	chkvars "$p"
-	eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
-done
-relname="$projectname-$version"
-export LOCALVERSION="-$projectname-${version%%-*}"
+	x_ cat "$1" config/data/coreboot/0 > "$paddedfile" || \
+	    err "could not pad file '$paddedfile'" "pad_one_byte" "$1"; :
 
-check_defconfig()
-{
-	[ -d "$1" ] || $err "Target '$1' not defined."
-	for x in "$1"/config/*; do
-		[ -f "$x" ] && printf "%s\n" "$x" && return 1
-	done; return 0
+	x_ mv "$paddedfile" "$1"
 }
 
-remkdir()
+unpad_one_byte()
 {
-	rm -Rf "$1" || $err "remkdir: !rm -Rf \"$1\""
-	mkdir -p "$1" || $err "remkdir: !mkdir -p \"$1\""
+	xromsize="$(expr $(stat -c '%s' "$1") - 1)" || \
+	    err "can't increment file size" "unpad_one_byte" "$@"
+
+	if [ $xromsize -lt 524288 ]; then
+		err "too small, $xromsize: $1" "unpad_one_byte" "$@"
+	fi
+
+	unpaddedfile="`mktemp || err "mktemp unpad_one_byte"`" || \
+	    err "can't make tmp file" "unpad_one_byte" "$@"
+
+	x_ dd if="$1" of="$unpaddedfile" bs=$xromsize count=1
+	x_ mv "$unpaddedfile" "$1"
 }
 
-mkrom_tarball()
+build_sbase()
 {
-	printf "%s\n" "$version" > "$1/version" || $err "$1 !version"
-	printf "%s\n" "$versiondate" > "$1/versiondate" || $err "$1 !vdate"
-	printf "%s\n" "$projectname" > "$1/projectname" || $err "$1 !pname"
+	if [ ! -f "$sha512sum" ]; then
+		x_ make -C "$xbmkpwd/util/sbase"
+	fi
+}
 
-	mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz"
-	x_ rm -Rf "$1"
+remkdir()
+{
+	x_ rm -Rf "$@"
+	x_ xbmkdir "$@"
 }
 
-mktarball()
+xbmkdir()
 {
-	[ "${2%/*}" = "$2" ] || \
-		mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
-	printf "\nCreating archive: %s\n\n" "$2"
-	tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball 2, $1"
-	mksha512sum "$2" "${2##*/}.sha512"
+	while [ $# -gt 0 ]
+	do
+		if [ ! -d "$1" ]; then
+			x_ mkdir -p "$1"
+		fi
+
+		shift 1
+	done
 }
 
-mksha512sum()
+fx_()
 {
-	(
-	[ "${1%/*}" != "$1" ] && x_ cd "${1%/*}"
-	sha512sum ./"${1##*/}" >> "$2" || $err "!sha512sum \"$1\" > \"$2\""
-	) || $err "failed to create tarball checksum"
+	xchk fx_ "$@"
+	xcmd="$1"
+
+	xfile="`mktemp || err "can't create tmpfile"`" || \
+	    err "can't make tmpfile" "fx_" "$@"
+
+	x_ rm -f "$xfile"
+	x_ touch "$xfile"
+
+	shift 1
+
+	"$@" 2>/dev/null | sort 1>"$xfile" 2>/dev/null || \
+	    err "can't sort to '$xfile'" "fx_" "$xcmd" "$@"
+
+	dx_ "$xcmd" "$xfile" || :
+	x_ rm -f "$xfile"
 }
 
-rmgit()
+dx_()
 {
-	(
-	cd "$1" || $err "!cd gitrepo $1"
-	find . -name ".git" -exec rm -Rf {} + || $err "!rm .git $1"
-	find . -name ".gitmodules" -exec rm -Rf {} + || $err "!rm .gitmod $1"
-	) || $err "Cannot remove .git/.gitmodules in $1"
+	xchk dx_ "$@"
+
+	if [ ! -f "$2" ]; then
+		return 0
+	fi
+
+	while read -r fx; do
+		$1 "$fx" || return 1; :
+	done < "$2" || err "cannot read '$2'" "dx_" "$@"; :
 }
 
-# return 0 if project is single-tree, otherwise 1
-# e.g. coreboot is multi-tree, so 1
-singletree()
+x_()
 {
-	for targetfile in "config/${1}/"*/target.cfg; do
-		[ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1
-	done; return 0
+	if [ $# -lt 1 ]; then
+		return 0
+	elif [ -z "$1" ]; then
+		err "Empty first arg" "x_" "$@"
+	else
+		"$@" || err "Unhandled error" "x_" "$@"
+	fi
 }
 
-download()
+xchk()
 {
-	cached="$XBMK_CACHE/file/$4"
-	dl_fail="n" # 1 url, 2 url backup, 3 destination, 4 checksum
-	vendor_checksum "$4" "$cached" 2>/dev/null && dl_fail="y"
-	[ "$dl_fail" = "n" ] && e "$3" f && return 0
-	mkdir -p "${3%/*}" "$XBMK_CACHE/file" || \
-	    $err "!mkdir '$3' '$XBMK_CACHE/file'"
-	for url in "$1" "$2"; do
-		[ "$dl_fail" = "n" ] && break
-		[ -z "$url" ] && continue
-		rm -f "$cached" || $err "!rm -f '$cached'"
-		curl --location --retry 3 -A "$_ua" "$url" -o "$cached" || \
-		    wget --tries 3 -U "$_ua" "$url" -O "$cached" || continue
-		vendor_checksum "$4" "$cached" || dl_fail="n"
-	done; [ "$dl_fail" = "y" ] && $err "$1 $2 $3 $4: not downloaded"
-	[ "$cached" = "$3" ] || cp "$cached" "$3" || $err "!d cp $cached $3"; :
+	if [ $# -lt 3 ]; then
+		err "$1 needs at least two arguments" "xchk" "$@"
+	elif [ -z "$2" ] || [ -z "$3" ]; then
+		err "arguments must not be empty" "xchk" "$@"
+	fi
 }
 
-vendor_checksum()
+err()
 {
-	[ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] || return 1
-	printf "Bad checksum for file: %s\n" "$2" 1>&2
-	rm -f "$2" || :
+	if [ $# -eq 1 ]; then
+		printf "ERROR %s: %s\n" "$0" "$1" 1>&2 || :
+	elif [ $# -gt 1 ]; then
+		printf "ERROR %s: %s: in command with args: " "$0" "$1" 1>&2
+		shift 1
+		xprintf "$@" 1>&2
+	else
+		printf "ERROR, but no arguments provided to err\n" 1>&2
+	fi
+
+	exit 1
 }
 
-cbfs()
+xprintf()
 {
-	ccmd="add-payload" && [ $# -gt 3 ] && ccmd="add"
-	lzma="-c lzma" && [ $# -gt 3 ] && lzma="-t raw"
-	x_ "$cbfstool" "$1" $ccmd -f "$2" -n "$3" $lzma
+	xprintfargs=0
+	while [ $# -gt 0 ]; do
+		printf "\"%s\"" "$1"
+		if [ $# -gt 1 ]; then
+			printf " "
+		fi
+
+		xprintfargs=1
+		shift 1
+	done
+	if [ $xprintfargs -gt 0 ]; then
+		printf "\n"
+	fi
 }