merge include/err.sh with include/option.sh
Signed-off-by: Leah Rowe <leah@libreboot.org>audit2-merge1
Leah Rowe
Leah Rowe
parent
3acac46536
commit
da748de455
1
build
1
build
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
set -u -e
|
||||
|
||||
. "include/err.sh"
|
||||
. "include/option.sh"
|
||||
|
||||
eval "$(setvars "" option aur_notice)"
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
# SPDX-License-Identifier: MIT
|
||||
# SPDX-FileCopyrightText: 2022-2024 Leah Rowe <leah@libreboot.org>
|
||||
|
||||
export LC_COLLATE=C
|
||||
export LC_ALL=C
|
||||
|
||||
version=""; versiondate=""; projectname=""; _nogit=""
|
||||
err="err_"; tmpdir=""; cbmk_status=""
|
||||
|
||||
# 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)
|
||||
cbmk_release=
|
||||
set | grep CBMK_RELEASE 1>/dev/null 2>/dev/null || cbmk_release="n" || :
|
||||
[ -z "$cbmk_release" ] && cbmk_release="$CBMK_RELEASE"
|
||||
[ "$cbmk_release" = "n" ] || [ "$cbmk_release" = "y" ] || cbmk_release="n"
|
||||
export CBMK_RELEASE="$cbmk_release"
|
||||
|
||||
# if set to n via export, status checks will be skipped during
|
||||
# all builds, and all targets will be built regardless of status.
|
||||
# this replicates the old behaviour of cbmk, prior to the checks.
|
||||
set | grep CBMK_STATUS 1>/dev/null 2>/dev/null && cbmk_status="$CBMK_STATUS"
|
||||
[ "$cbmk_status" = "y" ] || [ "$cbmk_status" = "n" ] || cbmk_status="y"
|
||||
export CBMK_STATUS="$cbmk_status"
|
||||
|
||||
tmpdir_was_set="y"
|
||||
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
|
||||
if [ "${tmpdir_was_set}" = "y" ]; then
|
||||
[ "${TMPDIR%_*}" = "/tmp/cbmk" ] || tmpdir_was_set="n"
|
||||
fi
|
||||
if [ "${tmpdir_was_set}" = "n" ]; then
|
||||
export TMPDIR="/tmp"
|
||||
tmpdir="$(mktemp -d -t cbmk_XXXXXXXX)"
|
||||
export TMPDIR="${tmpdir}"
|
||||
else
|
||||
export TMPDIR="${TMPDIR}"
|
||||
tmpdir="${TMPDIR}"
|
||||
fi
|
||||
|
||||
x_() {
|
||||
[ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0
|
||||
}
|
||||
|
||||
check_git()
|
||||
{
|
||||
which git 1>/dev/null 2>/dev/null || \
|
||||
git_err "git not installed. please install git-scm."
|
||||
git config --global user.name 1>/dev/null 2>/dev/null || \
|
||||
git_err "git config --global user.name \"John Doe\""
|
||||
git config --global user.email 1>/dev/null 2>/dev/null || \
|
||||
git_err "git config --global user.email \"john.doe@example.com\""
|
||||
}
|
||||
|
||||
git_err()
|
||||
{
|
||||
printf "You need to set git name/email, like so:\n%s\n\n" "$1" 1>&2
|
||||
$err "Git name/email not configured"
|
||||
}
|
||||
|
||||
check_project()
|
||||
{
|
||||
read -r projectname < projectname || :
|
||||
|
||||
[ ! -f version ] || read -r version < version || :
|
||||
version_="${version}"
|
||||
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
|
||||
version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}"
|
||||
|
||||
[ ! -f versiondate ] || read -r versiondate < versiondate || :
|
||||
versiondate_="${versiondate}"
|
||||
[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
|
||||
--pretty='%ct' HEAD)" || versiondate="${versiondate_}"
|
||||
|
||||
for p in projectname version versiondate; do
|
||||
eval "[ -n \"\$$p\" ] || $err \"$p unset\""
|
||||
eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
|
||||
done
|
||||
export LOCALVERSION="-${projectname}-${version%%-*}"
|
||||
}
|
||||
|
||||
setvars()
|
||||
{
|
||||
_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% }"
|
||||
}
|
||||
|
||||
err_()
|
||||
{
|
||||
printf "ERROR %s: %s\n" "${0}" "${1}" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
|
@ -3,6 +3,10 @@
|
|||
# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
|
||||
# SPDX-FileCopyrightText: 2020-2024 Leah Rowe <leah@libreboot.org>
|
||||
|
||||
export LC_COLLATE=C
|
||||
export LC_ALL=C
|
||||
|
||||
tmpdir_was_set="y"
|
||||
cbdir="src/coreboot/default"
|
||||
cbcfgsdir="config/coreboot"
|
||||
ifdtool="cbutils/default/ifdtool"
|
||||
|
|
@ -11,16 +15,58 @@ grubcfgsdir="config/grub"
|
|||
layoutdir="/boot/grub/layouts"
|
||||
. "${grubcfgsdir}/modules.list"
|
||||
tmpgit="${PWD}/tmp/gitclone"
|
||||
err="err_"
|
||||
|
||||
eval "$(setvars "" board boarddir)"
|
||||
err_()
|
||||
{
|
||||
printf "ERROR %s: %s\n" "${0}" "${1}" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
setvars()
|
||||
{
|
||||
_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% }"
|
||||
}
|
||||
eval "$(setvars "" _nogit _dest board boarddir cbmk_release cbmk_status threads \
|
||||
version versiondate projectname)"
|
||||
|
||||
# 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)
|
||||
set | grep CBMK_RELEASE 1>/dev/null 2>/dev/null || cbmk_release="n" || :
|
||||
[ -z "$cbmk_release" ] && cbmk_release="$CBMK_RELEASE"
|
||||
[ "$cbmk_release" = "n" ] || [ "$cbmk_release" = "y" ] || cbmk_release="n"
|
||||
export CBMK_RELEASE="$cbmk_release"
|
||||
|
||||
# if set to n via export, status checks will be skipped during
|
||||
# all builds, and all targets will be built regardless of status.
|
||||
# this replicates the old behaviour of cbmk, prior to the checks.
|
||||
set | grep CBMK_STATUS 1>/dev/null 2>/dev/null && cbmk_status="$CBMK_STATUS"
|
||||
[ "$cbmk_status" = "y" ] || [ "$cbmk_status" = "n" ] || cbmk_status="y"
|
||||
export CBMK_STATUS="$cbmk_status"
|
||||
|
||||
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
|
||||
if [ "${tmpdir_was_set}" = "y" ]; then
|
||||
[ "${TMPDIR%_*}" = "/tmp/cbmk" ] || tmpdir_was_set="n"
|
||||
fi
|
||||
if [ "${tmpdir_was_set}" = "n" ]; then
|
||||
export TMPDIR="/tmp"
|
||||
tmpdir="$(mktemp -d -t cbmk_XXXXXXXX)"
|
||||
export TMPDIR="${tmpdir}"
|
||||
else
|
||||
export TMPDIR="${TMPDIR}"
|
||||
tmpdir="${TMPDIR}"
|
||||
fi
|
||||
|
||||
threads=
|
||||
set | grep CBMK_THREADS 1>/dev/null 2>/dev/null && threads="$CBMK_THREADS"
|
||||
[ -z "$threads" ] && threads=1
|
||||
|
||||
expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \
|
||||
1>/dev/null 2>/dev/null || threads=1 # user specified a non-integer
|
||||
|
||||
export CBMK_THREADS="$threads"
|
||||
|
||||
items()
|
||||
|
|
@ -84,3 +130,44 @@ remkdir()
|
|||
rm -Rf "${1}" || $err "remkdir: !rm -Rf \"${1}\""
|
||||
mkdir -p "${1}" || $err "remkdir: !mkdir -p \"${1}\""
|
||||
}
|
||||
|
||||
x_() {
|
||||
[ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0
|
||||
}
|
||||
|
||||
check_git()
|
||||
{
|
||||
which git 1>/dev/null 2>/dev/null || \
|
||||
git_err "git not installed. please install git-scm."
|
||||
git config --global user.name 1>/dev/null 2>/dev/null || \
|
||||
git_err "git config --global user.name \"John Doe\""
|
||||
git config --global user.email 1>/dev/null 2>/dev/null || \
|
||||
git_err "git config --global user.email \"john.doe@example.com\""
|
||||
}
|
||||
|
||||
git_err()
|
||||
{
|
||||
printf "You need to set git name/email, like so:\n%s\n\n" "$1" 1>&2
|
||||
$err "Git name/email not configured"
|
||||
}
|
||||
|
||||
check_project()
|
||||
{
|
||||
read -r projectname < projectname || :
|
||||
|
||||
[ ! -f version ] || read -r version < version || :
|
||||
version_="${version}"
|
||||
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
|
||||
version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}"
|
||||
|
||||
[ ! -f versiondate ] || read -r versiondate < versiondate || :
|
||||
versiondate_="${versiondate}"
|
||||
[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
|
||||
--pretty='%ct' HEAD)" || versiondate="${versiondate_}"
|
||||
|
||||
for p in projectname version versiondate; do
|
||||
eval "[ -n \"\$$p\" ] || $err \"$p unset\""
|
||||
eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
|
||||
done
|
||||
export LOCALVERSION="-${projectname}-${version%%-*}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
set -u -e
|
||||
|
||||
. "include/err.sh"
|
||||
. "include/option.sh"
|
||||
|
||||
seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
set -u -e
|
||||
|
||||
. "include/err.sh"
|
||||
. "include/option.sh"
|
||||
|
||||
eval "$(setvars "" pico_sdk_dir pico_src_dir stm32_src_dir boards_dir)"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
set -u -e
|
||||
|
||||
. "include/err.sh"
|
||||
. "include/option.sh"
|
||||
|
||||
eval "$(setvars "" vdir relname src_dirname srcdir _xm target romdir mode)"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
set -u -e
|
||||
|
||||
. "include/err.sh"
|
||||
. "include/option.sh"
|
||||
. "include/git.sh"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue