1 files changed, 46 insertions, 47 deletions

diff --git a/include/lib.sh b/include/lib.sh
index a3cdf554..21066ecc 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -6,6 +6,9 @@
 export LC_COLLATE=C
 export LC_ALL=C
 
+projectname="libreboot"
+projectsite="https://libreboot.org/"
+
 [ -z "${PATH+x}" ] && \
     export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
 xbmkpath="$PATH"
@@ -23,9 +26,9 @@ err_()
 	printf "ERROR %s: %s\n" "$0" "$1" 1>&2
 	exit 1
 }
-
-xbmkpwd=`pwd` || $err "Cannot generate PWD"
-export PWD="$xbmkpwd"
+x_() {
+	[ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; :
+}
 
 setvars()
 {
@@ -43,14 +46,6 @@ chkvars()
 	done; :
 }
 
-eval "`setvars "" _nogit board reinstall versiondate projectsite projectname \
-    aur_notice configdir datadir version relname xbmk_parent`"
-
-for fv in projectname projectsite version versiondate; do
-	eval "[ ! -f \"$fv\" ] || read -r $fv < \"$fv\" || :"
-done
-chkvars projectname projectsite
-
 setcfg()
 {
 	[ $# -gt 1 ] && printf "e \"%s\" f missing && return %s;\n" "$1" "$2"
@@ -83,11 +78,25 @@ install_packages()
 	[ -n "$aur_notice" ] && \
 	    printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; :
 }
+
+eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
+    datadir version relname xbmktmp`"
+
 if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then
 	install_packages "$@" || exit 1
 	exit 0
 fi
 
+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"
+
+xbmkpwd="`pwd`" || $err "Cannot generate PWD"
+export PWD="$xbmkpwd"
+
+for fv in version versiondate; do
+	eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :"
+done
+
 pyver="2"
 python="python3"
 command -v python3 1>/dev/null || python="python"
@@ -104,9 +113,6 @@ if [ "${pyver%%.*}" != "3" ]; then
 	exit 1
 fi
 
-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"
-
 # XBMK_CACHE is a directory, for caching downloads and git repositories
 [ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$xbmkpwd/cache"
 [ -z "$XBMK_CACHE" ] && export XBMK_CACHE="$xbmkpwd/cache"
@@ -122,22 +128,25 @@ if [ -z "${TMPDIR+x}" ]; then
 	[ -f "lock" ] && $err "$xbmkpwd/lock exists. Is a build running?"
 	export TMPDIR="/tmp"
 	export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)"
+	xbmktmp="$TMPDIR"
 	touch lock || $err "cannot create 'lock' file"
-	rm -Rf "$XBMK_CACHE/xbmkpath" "$XBMK_CACHE/gnupath" || \
-	    $err "cannot remove xbmkpath"
-	mkdir -p "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" || \
-	    $err "cannot create gnupath"
-	export PATH="$XBMK_CACHE/xbmkpath:$XBMK_CACHE/gnupath:$PATH" || \
-	    $err "Can't create gnupath/xbmkpath"
+	x_ rm -Rf "$XBMK_CACHE/xbmkpath" "$XBMK_CACHE/gnupath"
+	x_ mkdir -p "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath"
+	export PATH="$XBMK_CACHE/xbmkpath:$XBMK_CACHE/gnupath:$PATH"
 	(
 	# set up python v3.x in PATH, in case it's not set up correctly.
 	# see code above that detected the correct python3 command.
 	cd "$XBMK_CACHE/xbmkpath" || $err "can't cd $XBMK_CACHE/xbmkpath"
-	ln -s "`command -v "$python"`" python || \
-	    $err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"
+	x_ ln -s "`command -v "$python"`" python
 	) || $err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"
-	xbmk_parent="y"
+
+	xbmk_rval=0
+	./mk "$@" || xbmk_rval=1
+	rm -Rf "$xbmktmp" || xbmk_rval=1
+	rm -f lock || xbmk_rval=1
+	exit $xbmk_rval
 fi
+xbmktmp="$TMPDIR"
 
 # 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)
@@ -148,15 +157,10 @@ fi
 expr "X$XBMK_THREADS" : "X-\{0,1\}[0123456789][0123456789]*$" \
     1>/dev/null 2>/dev/null || export XBMK_THREADS=1 # user gave a non-integer
 
-x_() {
-	[ $# -lt 1 ] || "$@" || \
-	    $err "Unhandled non-zero exit: $(echo "$@")"; :
-}
-
-[ -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"
+[ -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"
 
 version_="$version"
 [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
@@ -164,9 +168,9 @@ 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
+for p in version versiondate; do
 	chkvars "$p"
-	eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
+	eval "printf \"%s\\n\" \"\$$p\" > .$p || $err \"can't save $p\""
 done
 relname="$projectname-$version"
 export LOCALVERSION="-$projectname-${version%%-*}"
@@ -187,9 +191,8 @@ remkdir()
 
 mkrom_tarball()
 {
-	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"
+	printf "%s\n" "$version" > "$1/.version" || $err "$1 !version"
+	printf "%s\n" "$versiondate" > "$1/.versiondate" || $err "$1 !vdate"
 
 	mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz"
 	x_ rm -Rf "$1"
@@ -197,10 +200,8 @@ mkrom_tarball()
 
 mktarball()
 {
-	if [ "${2%/*}" != "$2" ]; then
-		mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
-	fi
-	tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball 2, $1"
+	[ "${2%/*}" = "$2" ] || x_ mkdir -p "${2%/*}"
+	x_ tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball2, $1"
 }
 
 mksha512sum()
@@ -226,7 +227,7 @@ singletree()
 {
 	for targetfile in "config/${1}/"*/target.cfg; do
 		[ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1; :
-	done; return 0
+	done; :
 }
 
 # can grab from the internet, or copy locally.
@@ -238,8 +239,7 @@ download()
 	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'"
+	x_ mkdir -p "${3%/*}" "$XBMK_CACHE/file"
 	for url in "$1" "$2"; do
 		[ "$dl_fail" = "n" ] && break
 		[ -z "$url" ] && continue
@@ -262,7 +262,7 @@ download()
 		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"; :
+	[ "$cached" = "$3" ] || x_ cp "$cached" "$3"; :
 }
 
 vendor_checksum()
@@ -289,8 +289,7 @@ cbfs()
 		fi
 	fi
 
-	"$cbfstool" "$fRom" $ccmd -f "$fAdd" -n "$fName" $lzma || \
-	    $err "CBFS fail: $fRom $ccmd -f '$fAdd' -n '$fName' $lzma"; :
+	x_ "$cbfstool" "$fRom" $ccmd -f "$fAdd" -n "$fName" $lzma
 }
 
 mk()