canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

general code cleanup in the build system 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-05-26 01:54:36 +01:00 committed by Leah Rowe
parent 583135e548
commit cbb2f4f8a9
6 changed files with 381 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
build
View File

@ -1,9 +1,9 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2014,2015,2020-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2014-2015,2020-2024 Leah Rowe <leah@libreboot.org>
# SPDX-FileCopyrightText: 2015 Patrick "P. J." McDermott <pj@pehjota.net> # Copyright (c) 2015 Patrick "P. J." McDermott <pj@pehjota.net>
# SPDX-FileCopyrightText: 2015, 2016 Klemens Nanni <contact@autoboot.org> # Copyright (c) 2015-2016 Klemens Nanni <contact@autoboot.org>
# SPDX-FileCopyrightText: 2022, Caleb La Grange <thonkpeasant@protonmail.com> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
set -u -e set -u -e
@ -39,39 +39,33 @@ main()
version) printf "%s\n" "$relname" ;; version) printf "%s\n" "$relname" ;;
release) shift 1; mkrelease $@ ;; release) shift 1; mkrelease $@ ;;
*) *)
[ -f "${spath}" ] || $err "Bad command. Check docs." [ -f "$spath" ] || $err "Bad command. Check docs."
shift 1; "$spath" $@ || $err "excmd: ${spath} ${@}" ;; shift 1; "$spath" $@ || $err "excmd: $spath $@" ;;
esac esac
} }
install_packages() install_packages()
{ {
if [ $# -lt 2 ]; then [ $# -lt 2 ] && $err "Bad command. Check docs."
printf "You must specify a distro, namely:\n" 1>&2 [ -f "config/dependencies/$2" ] || $err "Unsupported target"
printf "Look at files under config/dependencies/\n" 1>&2
printf "Example: ./build dependencies debian\n" 1>&2
$err "install_packages: target not specified"
fi
[ -f "config/dependencies/${2}" ] || $err "Unsupported target" . "config/dependencies/$2"
. "config/dependencies/${2}"
x_ $pkg_add $pkglist && [ -n "$aur_notice" ] && \ x_ $pkg_add $pkglist && [ -n "$aur_notice" ] && \
printf "Please install AUR packages: %s\n" "$aur_notice" 1>&2; return 0 printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; return 0
} }
git_init() git_init()
{ {
[ -L ".git" ] && return 1 [ -L ".git" ] && return 1
[ -e ".git" ] && return 0 [ -e ".git" ] && return 0
eval "$(setvars "$(date -Rud @${versiondate})" cdate _nogit)" eval "$(setvars "$(date -Rud @$versiondate)" cdate _nogit)"
git init || return 1 git init || return 1
git add -A . || return 1 git add -A . || return 1
git commit -m "${projectname} ${version}" --date "${cdate}" \ git commit -m "$projectname $version" --date "$cdate" \
--author="xbmk <xbmk@example.com>" || return 1 --author="xbmk <xbmk@example.com>" || return 1
git tag -a "${version}" -m "${projectname} ${version}" || return 1 git tag -a "$version" -m "$projectname $version" || return 1
} }
mkrelease() mkrelease()
@ -80,54 +74,54 @@ mkrelease()
vdir="release" vdir="release"
while getopts d:m: option; do while getopts d:m: option; do
[ -z "${OPTARG}" ] && $err "Empty argument not allowed" [ -z "$OPTARG" ] && $err "Empty argument not allowed"
case "${option}" in case "$option" in
d) vdir="${OPTARG}" ;; d) vdir="$OPTARG" ;;
m) mode="${OPTARG}" ;; m) mode="$OPTARG" ;;
*) $err "Invalid option" ;; *) $err "Invalid option" ;;
esac esac
done done
vdir="${vdir}/${version}" vdir="$vdir/$version"
src_dirname="${relname}_src" src_dirname="${relname}_src"
srcdir="${vdir}/${src_dirname}" srcdir="$vdir/$src_dirname"
[ -e "${vdir}" ] && $err "already exists: \"${vdir}\"" [ -e "$vdir" ] && $err "already exists: \"$vdir\""
mkdir -p "${vdir}" || $err "mkvdir: !mkdir -p \"${vdir}\"" mkdir -p "$vdir" || $err "mkvdir: !mkdir -p \"$vdir\""
git clone . "${srcdir}" || $err "mkdir: !gitclone \"${srcdir}\"" git clone . "$srcdir" || $err "mkdir: !gitclone \"$srcdir\""
build_release build_release
printf "\n\nDONE! Check release files under %s\n" "${vdir}" printf "\n\nDONE! Check release files under %s\n" "$vdir"
} }
build_release() build_release()
{ {
_xm="build_release ${vdir}" _xm="build_release $vdir"
( (
cd "${srcdir}" || $err "${_xm}: !cd \"${srcdir}\"" cd "$srcdir" || $err "$_xm: !cd \"$srcdir\""
fetch_trees fetch_trees
x_ mv src/docs docs x_ mv src/docs docs
) || $err "can't create release files" ) || $err "can't create release files"
git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \ git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \
--abbrev-commit > "${srcdir}/CHANGELOG" || $err "!gitlog $srcdir" --abbrev-commit > "$srcdir/CHANGELOG" || $err "!gitlog $srcdir"
( (
cd "${srcdir%/*}" || $err "${_xm}: mktarball \"${srcdir}\"" cd "${srcdir%/*}" || $err "$_xm: mktarball \"$srcdir\""
mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || $err "$_xm: mksrc" mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || $err "$_xm: mksrc"
) || $err "can't create src tarball" ) || $err "can't create src tarball"
[ "${mode}" = "src" ] && return 0 [ "$mode" = "src" ] && return 0
( (
cd "${srcdir}" || $err "${_xm}: 2 !cd \"${srcdir}\"" cd "$srcdir" || $err "$_xm: 2 !cd \"$srcdir\""
./build roms all || $err "${_xm}: roms-all" ./build roms all || $err "$_xm: roms-all"
./build roms serprog rp2040 || $err "${_xm}: rp2040" ./build roms serprog rp2040 || $err "$_xm: rp2040"
./build roms serprog stm32 || $err "${_xm}: stm32" ./build roms serprog stm32 || $err "$_xm: stm32"
x_ mv bin ../roms x_ mv bin ../roms
) || $err "can't build rom images" ) || $err "can't build rom images"
rm -Rf "${srcdir}" || $err "!rm -Rf ${srcdir}" rm -Rf "$srcdir" || $err "!rm -Rf $srcdir"
} }
fetch_trees() fetch_trees()
@ -151,8 +145,8 @@ fail()
tmp_cleanup() tmp_cleanup()
{ {
[ "${tmpdir_was_set}" = "n" ] || return 0 [ "$tmpdir_was_set" = "n" ] || return 0
rm -Rf "${tmpdir}" || return 1 rm -Rf "$tmpdir" || return 1
} }
main $@ main $@

27
include/deblob.sh
View File

@ -2,31 +2,30 @@
# SPDX-FileCopyrightText: 2020,2021,2023,2024 Leah Rowe <leah@libreboot.org> # SPDX-FileCopyrightText: 2020,2021,2023,2024 Leah Rowe <leah@libreboot.org>
# can delete from multi- and single-tree projects. # can delete from multi- and single-tree projects.
# called from build_projects() and handle_src_tree() on script/update/trees # called from script/trees when downloading sources.
nukeblobs() nukeblobs()
{ {
del="n" del="n"
pjcfgdir="${1%/}" pjcfgdir="${1%/}"
pjsrcdir="${2%/}" pjsrcdir="${2%/}"
pjsrcdir="${pjsrcdir#src/}" pjsrcdir="${pjsrcdir#src/}"
[ ! -f "config/${pjcfgdir}/blobs.list" ] && return 0 [ ! -f "config/$pjcfgdir/blobs.list" ] && return 0
while read -r blobfile; do while read -r blobfile; do
rmf="$(realpath "src/${pjsrcdir}/${blobfile}" 2>/dev/null)" || \ rmf="$(realpath "src/$pjsrcdir/$blobfile" 2>/dev/null)" || \
continue continue
[ -L "${rmf}" ] && continue # we will delete the actual file [ -L "$rmf" ] && continue # we will delete the actual file
[ "${rmf#${PWD}/src/${pjsrcdir}}" = "${rmf}" ] && continue [ "${rmf#"$PWD/src/$pjsrcdir"}" = "$rmf" ] && continue
[ "${rmf#${PWD}/src/}" = "${pjsrcdir}" ] && continue [ "${rmf#"$PWD/src/"}" = "$pjsrcdir" ] && continue
rmf="${rmf#${PWD}/}" rmf="${rmf#"$PWD/"}"
[ -e "${rmf}" ] || continue [ -e "$rmf" ] || continue
del="y" del="y"
rm -Rf "${rmf}" || \ rm -Rf "$rmf" || $err "$pjcfgdir/blobs: can't rm \"$blobfile\""
$err "nukeblobs ${pjcfgdir}/blobs: can't rm \"${blobfile}\"" printf "nukeblobs %s: deleted \"%s\"\n" "$pjcfgdir" "$rmf"
printf "nukeblobs %s: deleted \"%s\"\n" "${pjcfgdir}" "${rmf}" done < "config/$pjcfgdir/blobs.list"
done < "config/${pjcfgdir}/blobs.list"
[ "${del}" = "y" ] && return 0 [ "${del}" = "y" ] && return 0
printf "nukeblobs %s: no defined blobs exist in dir, src/%s\n" 1>&2 \ printf "nukeblobs %s: no defined blobs exist in dir, src/%s\n" 1>&2 \
"${pjcfgdir}" "${pjsrcdir}" "$pjcfgdir" "$pjsrcdir"
printf "(this is not an error)\n" printf "(this is not an error)\n" 1>&2
} }

68
include/git.sh
View File

@ -1,34 +1,30 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2020,2021,2023,2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \ eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \
mdir subrev subrepo subrepo_bkup)" mdir subrev subrepo subrepo_bkup)"
fetch_project_trees() fetch_project_trees()
{ {
_target="${target}" _target="$target"
[ ! -d "src/${project}/${project}" ] && x_ mkdir -p "src/${project}" \ [ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \
&& fetch_project_repo "${project}" && fetch_project_repo "$project"
fetch_config fetch_config
if [ -d "src/${project}/${tree}" ]; then e "src/$project/$tree" d && return 0
printf "download/%s %s (%s): exists\n" \
"${project}" "${tree}" "${_target}" 1>&2
return 0
fi
prepare_new_tree prepare_new_tree
} }
fetch_config() fetch_config()
{ {
rm -f "${cfgsdir}/"*/seen || $err "fetch_config ${cfgsdir}: !rm seen" rm -f "$cfgsdir/"*/seen || $err "fetch_config $cfgsdir: !rm seen"
eval "$(setvars "" xtree tree_depend)" eval "$(setvars "" xtree tree_depend)"
while true; do while true; do
eval "$(setvars "" rev tree)" eval "$(setvars "" rev tree)"
_xm="fetch_config ${project}/${_target}" _xm="fetch_config $project/$_target"
load_target_config "${_target}" load_target_config "$_target"
[ "${_target}" = "${tree}" ] && break [ "$_target" = "$tree" ] && break
_target="${tree}" _target="$tree"
done done
[ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \
x_ ./update trees -f "$project" "$tree_depend"; return 0 x_ ./update trees -f "$project" "$tree_depend"; return 0
@ -37,8 +33,7 @@ fetch_config()
load_target_config() load_target_config()
{ {
[ -f "$cfgsdir/$1/target.cfg" ] || $err "$1: target.cfg missing" [ -f "$cfgsdir/$1/target.cfg" ] || $err "$1: target.cfg missing"
[ -f "${cfgsdir}/${1}/seen" ] && \ [ -f "$cfgsdir/$1/seen" ] && $err "$_xm cfg: infinite loop in trees"
$err "${_xm} check: infinite loop in tree definitions"
. "$cfgsdir/$1/target.cfg" || $err "load_target_config !$cfgsdir/$1" . "$cfgsdir/$1/target.cfg" || $err "load_target_config !$cfgsdir/$1"
touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen" touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen"
@ -48,8 +43,8 @@ prepare_new_tree()
{ {
printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target" printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
cp -R "src/${project}/${project}" "${tmpgit}" || \ cp -R "src/$project/$project" "$tmpgit" || \
$err "prepare_new_tree ${project}/${tree}: can't make tmpclone" $err "prepare_new_tree $project/$tree: can't make tmpclone"
git_prep "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update" git_prep "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update"
nukeblobs "$project/$tree" "$project/$tree" nukeblobs "$project/$tree" "$project/$tree"
} }
@ -58,32 +53,29 @@ fetch_project_repo()
{ {
eval "$(setvars "" xtree tree_depend)" eval "$(setvars "" xtree tree_depend)"
scan_config "${project}" "config/git" scan_config "$project" "config/git"
[ -z "${loc+x}" ] && $err "fetch_project_repo $project: loc not set" [ -z "${loc+x}" ] && $err "fetch_project_repo $project: loc not set"
[ -z "${url+x}" ] && $err "fetch_project_repo $project: url not set" [ -z "${url+x}" ] && $err "fetch_project_repo $project: url not set"
clone_project clone_project
[ -z "${depend}" ] || for d in ${depend} ; do [ -z "$depend" ] || for d in $depend ; do
x_ ./update trees -f ${d} x_ ./update trees -f $d
done done
rm -Rf "${tmpgit}" || $err "fetch_repo: !rm -Rf ${tmpgit}" rm -Rf "$tmpgit" || $err "fetch_repo: !rm -Rf $tmpgit"
for x in config/git/*; do for x in config/git/*; do
[ -f "${x}" ] && nukeblobs "${x##*/}" "src/${x##*/}"; continue [ -f "$x" ] && nukeblobs "${x##*/}" "src/${x##*/}"; continue
done done
} }
clone_project() clone_project()
{ {
loc="${loc#src/}" loc="${loc#src/}"
loc="src/${loc}" loc="src/$loc"
if [ -d "${loc}" ]; then e "$loc" d && return 0
printf "%s already exists, so skipping download\n" "$loc" 1>&2
return 0
fi
git clone $url "$tmpgit" || git clone $bkup_url "$tmpgit" \ git clone $url "$tmpgit" || git clone $bkup_url "$tmpgit" \
|| $err "clone_project: could not download ${project}" || $err "clone_project: could not download $project"
git_prep "$PWD/config/$project/patches" "$loc" git_prep "$PWD/config/$project/patches" "$loc"
} }
@ -113,7 +105,7 @@ prep_submodules()
{ {
[ -f "$tmpgit/.gitmodules" ] || return 0 [ -f "$tmpgit/.gitmodules" ] || return 0
mdir="${PWD}/config/submodule/$project" mdir="$PWD/config/submodule/$project"
[ -n "$tree" ] && mdir="$mdir/$tree" [ -n "$tree" ] && mdir="$mdir/$tree"
if [ -f "$mdir/module.list" ]; then if [ -f "$mdir/module.list" ]; then
@ -142,8 +134,7 @@ fetch_submodule()
$err "! . $mcfgdir/module.cfg" $err "! . $mcfgdir/module.cfg"
if [ -n "$subrepo" ] || [ -n "$subrepo_bkup" ]; then if [ -n "$subrepo" ] || [ -n "$subrepo_bkup" ]; then
[ -n "$subrev" ] || \ [ -n "$subrev" ] || $err "$1, $mdir: subrev not defined"
$err "$1 as per $mdir: subrev not defined"
rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'" rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'"
for mod in "$subrepo" "$subrepo_bkup"; do for mod in "$subrepo" "$subrepo_bkup"; do
@ -154,16 +145,15 @@ fetch_submodule()
done done
[ -d "$tmpgit/$1" ] || $err "!clone $mod $project $mcfgdir $1" [ -d "$tmpgit/$1" ] || $err "!clone $mod $project $mcfgdir $1"
else else
git -C "$tmpgit" submodule update --init -- "$1" || \ git -C "$tmpgit" submodule update --init -- "$1" || $err \
$err "$mdir: !update $1" "$mdir: !update $1"
fi fi
} }
patch_submodule() patch_submodule()
{ {
[ -z "$subrev" ] || \ [ -z "$subrev" ] || git -C "$tmpgit/$1" reset --hard "$subrev" || \
git -C "$tmpgit/$1" reset --hard "$subrev" || \ $err "$mdir $1: cannot reset git revision"
$err "$mdir $1: cannot reset git revision"
git_am_patches "$tmpgit/$1" "$mdir/${1##*/}/patches" git_am_patches "$tmpgit/$1" "$mdir/${1##*/}/patches"
} }
@ -172,7 +162,7 @@ git_am_patches()
{ {
for _patch in "$2/"*; do for _patch in "$2/"*; do
[ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \ [ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \
"$_patch" || $err "git_am $1 $2: !git am $_patch"; continue "$_patch" || $err "$1 $2: !git am $_patch"; continue
done done
for _patches in "$2/"*; do for _patches in "$2/"*; do
[ ! -L "$_patches" ] && [ -d "$_patches" ] && \ [ ! -L "$_patches" ] && [ -d "$_patches" ] && \

117
include/option.sh
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-only # SPDX-License-Identifier: GPL-3.0-only
# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# SPDX-FileCopyrightText: 2020-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2020-2024 Leah Rowe <leah@libreboot.org>
export LC_COLLATE=C export LC_COLLATE=C
export LC_ALL=C export LC_ALL=C
@ -13,13 +13,13 @@ ifdtool="cbutils/default/ifdtool"
cbfstool="cbutils/default/cbfstool" cbfstool="cbutils/default/cbfstool"
grubcfgsdir="config/grub" grubcfgsdir="config/grub"
layoutdir="/boot/grub/layouts" layoutdir="/boot/grub/layouts"
. "${grubcfgsdir}/modules.list" . "$grubcfgsdir/modules.list"
tmpgit="${PWD}/tmp/gitclone" tmpgit="$PWD/tmp/gitclone"
err="err_" err="err_"
err_() err_()
{ {
printf "ERROR %s: %s\n" "${0}" "${1}" 1>&2 printf "ERROR %s: %s\n" "$0" "$1" 1>&2
exit 1 exit 1
} }
@ -27,14 +27,14 @@ setvars()
{ {
_setvars="" _setvars=""
[ $# -lt 2 ] && $err "setvars: too few arguments" [ $# -lt 2 ] && $err "setvars: too few arguments"
val="${1}" && shift 1 val="$1" && shift 1
for var in $@; do for var in $@; do
_setvars="${var}=\"${val}\"; ${_setvars}" _setvars="$var=\"$val\"; $_setvars"
done done
printf "%s\n" "${_setvars% }" printf "%s\n" "${_setvars% }"
} }
eval "$(setvars "" versiondate tmpdir _nogit version board boarddir \ eval "$(setvars "" xbmk_release tmpdir _nogit version board boarddir relname \
xbmk_release threads projectname relname)" versiondate threads projectname)"
# if "y": a coreboot target won't be built if target.cfg says release="n" # 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) # (this is used to exclude certain build targets from releases)
@ -44,16 +44,16 @@ set | grep XBMK_RELEASE 1>/dev/null 2>/dev/null || xbmk_release="n" || :
export XBMK_RELEASE="$xbmk_release" export XBMK_RELEASE="$xbmk_release"
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n" set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
if [ "${tmpdir_was_set}" = "y" ]; then if [ "$tmpdir_was_set" = "y" ]; then
[ "${TMPDIR%_*}" = "/tmp/xbmk" ] || tmpdir_was_set="n" [ "${TMPDIR%_*}" = "/tmp/xbmk" ] || tmpdir_was_set="n"
fi fi
if [ "${tmpdir_was_set}" = "n" ]; then if [ "$tmpdir_was_set" = "n" ]; then
export TMPDIR="/tmp" export TMPDIR="/tmp"
tmpdir="$(mktemp -d -t xbmk_XXXXXXXX)" tmpdir="$(mktemp -d -t xbmk_XXXXXXXX)"
export TMPDIR="${tmpdir}" export TMPDIR="$tmpdir"
else else
export TMPDIR="${TMPDIR}" export TMPDIR="$TMPDIR"
tmpdir="${TMPDIR}" tmpdir="$TMPDIR"
fi fi
set | grep XBMK_THREADS 1>/dev/null 2>/dev/null && threads="$XBMK_THREADS" set | grep XBMK_THREADS 1>/dev/null 2>/dev/null && threads="$XBMK_THREADS"
@ -63,7 +63,7 @@ expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \
export XBMK_THREADS="$threads" export XBMK_THREADS="$threads"
x_() { x_() {
[ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0 [ $# -lt 1 ] || $@ || $err "Unhandled non-zero exit: $@"; return 0
} }
[ -e ".git" ] || [ -f "version" ] || printf "unknown\n" > version || \ [ -e ".git" ] || [ -f "version" ] || printf "unknown\n" > version || \
@ -73,53 +73,49 @@ x_() {
read -r projectname < projectname || : read -r projectname < projectname || :
[ ! -f version ] || read -r version < version || : [ ! -f version ] || read -r version < version || :
version_="${version}" version_="$version"
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}" version="git-$(git rev-parse HEAD 2>&1)" || version="$version_"
[ ! -f versiondate ] || read -r versiondate < versiondate || : [ ! -f versiondate ] || read -r versiondate < versiondate || :
versiondate_="${versiondate}" versiondate_="$versiondate"
[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \ [ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
--pretty='%ct' HEAD)" || versiondate="${versiondate_}" --pretty='%ct' HEAD)" || versiondate="$versiondate_"
for p in projectname version versiondate; do for p in projectname version versiondate; do
eval "[ -n \"\$$p\" ] || $err \"$p unset\"" eval "[ -n \"\$$p\" ] || $err \"$p unset\""
eval "x_ printf \"%s\\n\" \"\$$p\" > $p" eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
done done
relname="${projectname}-${version}" relname="$projectname-$version"
export LOCALVERSION="-${projectname}-${version%%-*}" export LOCALVERSION="-$projectname-${version%%-*}"
items() items()
{ {
rval=1 rval=1
if [ ! -d "${1}" ]; then e "$1" d not && return 1
printf "items: directory '%s' doesn't exist" "${1}" 1>&2 for x in "$1/"*; do
return 1
fi
for x in "${1}/"*; do
# -e used because this is for files *or* directories # -e used because this is for files *or* directories
[ -e "${x}" ] || continue [ -e "$x" ] || continue
[ "${x##*/}" = "build.list" ] && continue [ "${x##*/}" = "build.list" ] && continue
printf "%s\n" "${x##*/}" 2>/dev/null printf "%s\n" "${x##*/}" 2>/dev/null
rval=0 rval=0
done done
return ${rval} return $rval
} }
scan_config() scan_config()
{ {
awkstr=" /\{.*${1}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }" awkstr=" /\{.*$1.*}{/ {flag=1;next} /\}/{flag=0} flag { print }"
confdir="${2}" confdir="$2"
revfile="$(mktemp -t sources.XXXXXXXXXX)" revfile="$(mktemp -t sources.XXXXXXXXXX)"
cat "${confdir}/"* > "${revfile}" || \ cat "$confdir/"* > "$revfile" || $err "$confdir: can't cat files"
$err "scan_config ${confdir}: Cannot concatenate files"
while read -r line ; do while read -r line ; do
set ${line} 1>/dev/null 2>/dev/null || : set $line 1>/dev/null 2>/dev/null || :
if [ "${1%:}" = "depend" ]; then if [ "${1%:}" = "depend" ]; then
depend="${depend} ${2}" depend="$depend $2"
else else
eval "${1%:}=\"${2}\"" eval "${1%:}=\"$2\""
fi fi
done << EOF done << EOF
$(eval "awk '${awkstr}' \"${revfile}\"") $(eval "awk '$awkstr' \"$revfile\"")
EOF EOF
rm -f "$revfile" || $err "scan_config: Cannot remove tmpfile" rm -f "$revfile" || $err "scan_config: Cannot remove tmpfile"
} }
@ -127,27 +123,26 @@ EOF
check_defconfig() check_defconfig()
{ {
[ -d "$1" ] || $err "Target '$1' not defined." [ -d "$1" ] || $err "Target '$1' not defined."
for x in "${1}"/config/*; do for x in "$1"/config/*; do
[ -f "${x}" ] && printf "%s\n" "$x" && return 1 [ -f "$x" ] && printf "%s\n" "$x" && return 1
done done
} }
handle_coreboot_utils() handle_coreboot_utils()
{ {
for util in cbfstool ifdtool; do for util in cbfstool ifdtool; do
x_ ./update trees ${_f} "src/coreboot/${1}/util/${util}" x_ ./update trees $_f "src/coreboot/$1/util/$util"
[ -z "${mode}" ] && [ ! -f "cbutils/${1}/${util}" ] && \ [ -z "$mode" ] && [ ! -f "cbutils/$1/$util" ] && \
x_ mkdir -p "cbutils/${1}" && \ x_ mkdir -p "cbutils/$1" && \
x_ cp "src/coreboot/${1}/util/${util}/${util}" \ x_ cp "src/coreboot/$1/util/$util/$util" "cbutils/$1"
"cbutils/${1}" [ -z "$mode" ] || x_ rm -Rf "cbutils/$1"
[ -z "${mode}" ] || x_ rm -Rf "cbutils/${1}"
done done
} }
remkdir() remkdir()
{ {
rm -Rf "${1}" || $err "remkdir: !rm -Rf \"${1}\"" rm -Rf "$1" || $err "remkdir: !rm -Rf \"$1\""
mkdir -p "${1}" || $err "remkdir: !mkdir -p \"${1}\"" mkdir -p "$1" || $err "remkdir: !mkdir -p \"$1\""
} }
git_err() git_err()
@ -158,9 +153,9 @@ git_err()
mkrom_tarball() mkrom_tarball()
{ {
printf "%s\n" "${version}" > "${1}/version" || $err "$1 !version" printf "%s\n" "$version" > "$1/version" || $err "$1 !version"
printf "%s\n" "${versiondate}" > "${1}/versiondate" || $err "$1 !vdate" printf "%s\n" "$versiondate" > "$1/versiondate" || $err "$1 !vdate"
printf "%s\n" "${projectname}" > "${1}/projectname" || $err "$1 !pname" printf "%s\n" "$projectname" > "$1/projectname" || $err "$1 !pname"
mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz" mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz"
x_ rm -Rf "$1" x_ rm -Rf "$1"
@ -168,20 +163,20 @@ mkrom_tarball()
mktarball() mktarball()
{ {
[ "${2%/*}" = "${2}" ] || \ [ "${2%/*}" = "$2" ] || \
mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\"" mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
printf "\nCreating archive: %s\n\n" "$2" printf "\nCreating archive: %s\n\n" "$2"
tar -c "$1" | xz -T$threads -9e > "$2" || \ tar -c "$1" | xz -T$threads -9e > "$2" || \
$err "mktarball 2, $1" $err "mktarball 2, $1"
mksha512sum "${2}" "${2##*/}.sha512" mksha512sum "$2" "${2##*/}.sha512"
} }
mksha512sum() mksha512sum()
{ {
( (
[ "${1%/*}" != "${1}" ] && x_ cd "${1%/*}" [ "${1%/*}" != "$1" ] && x_ cd "${1%/*}"
sha512sum ./"${1##*/}" >> "${2}" || \ sha512sum ./"${1##*/}" >> "$2" || \
$err "!sha512sum \"${1}\" > \"${2}\"" $err "!sha512sum \"$1\" > \"$2\""
) || $err "failed to create tarball checksum" ) || $err "failed to create tarball checksum"
} }
@ -193,3 +188,15 @@ rmgit()
find . -name ".gitmodules" -exec rm -Rf {} + || $err "!rm .gitmod $1" find . -name ".gitmodules" -exec rm -Rf {} + || $err "!rm .gitmod $1"
) || $err "Cannot remove .git/.gitmodules in $1" ) || $err "Cannot remove .git/.gitmodules in $1"
} }
e()
{
es_t="e"
[ $# -gt 1 ] && es_t="$2"
es2=""
estr="[ -$es_t \"\$1\" ] || return 1"
[ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="not "
eval "$estr"
printf "%s %sfound\n" "$1" "$es2" 1>&2
}

387
script/roms
View File

@ -1,10 +1,10 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023,2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2014-2016,2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
# SPDX-FileCopyrightText: 2021,2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2021-2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com> # Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
# SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com> # Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
set -u -e set -u -e
@ -14,64 +14,56 @@ seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
grub_background="background1280x800.png" grub_background="background1280x800.png"
grubelf="elf/grub/grub.elf" grubelf="elf/grub/grub.elf"
cfgsdir="config/coreboot" cfgsdir="config/coreboot"
pico_src_dir="src/pico-serprog" picosrc="src/pico-serprog"
pico_sdk_dir="src/pico-sdk" picosdk="src/pico-sdk"
stm32_src_dir="src/stm32-vserprog" stm32src="src/stm32-vserprog"
# Disable all payloads by default. # Disable all payloads by default.
# target.cfg files have to specifically enable [a] payload(s) # target.cfg files have to specifically enable [a] payload(s)
pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t" pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t"
pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin" pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub mt86bin"
v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release" v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release"
v="${v} grub_timeout ubdir board grub_scan_disk uboot_config" v="$v grub_timeout ubdir board grub_scan_disk uboot_config"
eval "$(setvars "n" ${pv} serprog)" eval "$(setvars "n" $pv serprog)"
eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets \ eval "$(setvars "" $v boards _displaymode _payload _keyboard all targets \
serprog_boards_dir)" serprog_boards_dir)"
main() main()
{ {
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case ${1} in case "$1" in
list) list) x_ items config/coreboot; return 0 ;;
x_ items config/coreboot serprog) serprog="y"; shift 1; break ;;
return 0 ;; -d) _displaymode="$2" ;;
serprog) -p) _payload="$2" ;;
serprog="y" -k) _keyboard="$2" ;;
shift 1; break ;;
-d) _displaymode="${2}" ;;
-p) _payload="${2}" ;;
-k) _keyboard="${2}" ;;
*) *)
[ "${1}" = "all" ] && all="y" [ "$1" = "all" ] && all="y"
boards="${1} ${boards}" boards="$1 $boards"
shift && continue ;; shift && continue ;;
esac esac
shift 2 shift 2
done done
if [ "$serprog" = "y" ]; then if [ "$serprog" = "y" ]; then
handle_serprog $@ handle_serprog $@; return 0
return 0
else else
[ "${all}" != "y" ] || boards=$(items config/coreboot) || \ [ "$all" != "y" ] || boards="$(items config/coreboot)" || \
$err "Cannot generate list of boards for building" $err "Cannot generate list of boards for building"
for x in ${boards}; do for x in $boards; do
[ -d "config/coreboot/$x/config" ] && \ [ -d "config/coreboot/$x/config" ] && \
handle_coreboot_target "$x" && continue handle_coreboot_target "$x"; continue
printf "No configs for %s; skipping\n" "$x"
done done
fi fi
bstr="directories" x="directories"
[ "$xbmk_release" = "y" ] && bstr="tarballs" [ "$xbmk_release" = "y" ] && x="archives (remember the inject command)"
[ -z "${targets}" ] && $err "No ROM images were compiled" [ -z "$targets" ] && $err "No ROM images were compiled"
printf "\nROM images available in these %s:\n" "$bstr" printf "\nROM images available in these %s:\n" "$bstr"
eval "printf \"${targets}\"" eval "printf \"$targets\""
printf "^^ ROM images available in these %s.\n\n" "$bstr" printf "^^ ROM images available in these %s.\n\n" "$bstr"
[ "$xbmk_release" = "y" ] && \
printf "Always run the inject command on release images!\n"
printf "DO NOT flash images from elf/ - please use bin/ instead.\n" printf "DO NOT flash images from elf/ - please use bin/ instead.\n"
} }
@ -79,25 +71,24 @@ handle_serprog()
{ {
[ -z "${1+x}" ] && $err "bad command. Check $projectname docs." [ -z "${1+x}" ] && $err "bad command. Check $projectname docs."
[ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && $err "bad command" [ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && $err "bad command"
if [ "${1}" = "rp2040" ]; then if [ "$1" = "rp2040" ]; then
serprog_boards_dir=${pico_sdk_dir}/src/boards/include/boards serprog_boards_dir="$picosdk/src/boards/include/boards"
[ -d "$pico_src_dir" ] || x_ ./update trees -f "pico-serprog" [ -d "$picosrc" ] || x_ ./update trees -f "pico-serprog"
elif [ "${1}" = "stm32" ]; then elif [ "$1" = "stm32" ]; then
serprog_boards_dir=${stm32_src_dir}/boards serprog_boards_dir="$stm32src/boards"
[ -d "$stm32_src_dir" ] || x_ ./update trees -f "stm32-vserprog" [ -d "$stm32src" ] || x_ ./update trees -f "stm32-vserprog"
fi fi
x_ mkdir -p "bin/serprog_${1}" x_ mkdir -p "bin/serprog_$1"
if [ $# -gt 1 ] && [ "${2}" = "list" ]; then if [ $# -gt 1 ] && [ "$2" = "list" ]; then
list_serprog_boards ${serprog_boards_dir} list_serprog_boards "$serprog_boards_dir"
return 0 return 0
elif [ $# -gt 1 ]; then elif [ $# -gt 1 ]; then
build_${1}_rom "${2}" build_${1}_rom "$2"
else else
printf "Building all serprog targets\n" list_serprog_boards "$serprog_boards_dir" | \
list_serprog_boards "${serprog_boards_dir}" | \
while read -r board; do while read -r board; do
build_${1}_rom "${board}" build_${1}_rom "$board"
done done
fi fi
@ -106,75 +97,70 @@ handle_serprog()
build_rp2040_rom() build_rp2040_rom()
{ {
board=${1} board="$1"
printf "Building pico-serprog for %s\n" "${board}" printf "Building pico-serprog for %s\n" "$board"
x_ cmake -DPICO_BOARD="$board" -DPICO_SDK_PATH="$pico_sdk_dir" \ x_ cmake -DPICO_BOARD="$board" -DPICO_SDK_PATH="$picosdk" \
-B "${pico_src_dir}/build" "${pico_src_dir}" -B "$picosrc/build" "$picosrc"
x_ cmake --build "${pico_src_dir}/build" x_ cmake --build "$picosrc/build"
x_ mv ${pico_src_dir}/build/pico_serprog.uf2 \ x_ mv "$picosrc/build/pico_serprog.uf2" \
bin/serprog_rp2040/serprog_${board}.uf2 "bin/serprog_rp2040/serprog_$board.uf2"
printf "output to bin/serprog_rp2040/serprog_%s.uf2\n" "$board" printf "output to bin/serprog_rp2040/serprog_%s.uf2\n" "$board"
} }
build_stm32_rom() build_stm32_rom()
{ {
board=${1} board="$1"
printf "Building stm32-vserprog for %s\n" "${board}" printf "Building stm32-vserprog for %s\n" "$board"
x_ make -C $stm32_src_dir libopencm3-just-make BOARD=$board x_ make -C "$stm32src" libopencm3-just-make BOARD=$board
x_ make -C ${stm32_src_dir} BOARD=${board} x_ make -C "$stm32src" BOARD=$board
x_ mv ${stm32_src_dir}/stm32-vserprog.hex \ x_ mv "$stm32src/stm32-vserprog.hex" \
bin/serprog_stm32/serprog_${board}.hex "bin/serprog_stm32/serprog_$board.hex"
printf "output to bin/serprog_stm32/serprog_%s.hex\n" "$board" printf "output to bin/serprog_stm32/serprog_%s.hex\n" "$board"
} }
list_serprog_boards() list_serprog_boards()
{ {
basename -a -s .h "${1}/"*.h || $err "list_boards $1: can't list boards" basename -a -s .h "$1/"*.h || $err "$1: can't list boards"
} }
handle_coreboot_target() handle_coreboot_target()
{ {
eval "$(setvars "n" ${pv}) $(setvars "" ${v})" eval "$(setvars "n" $pv) $(setvars "" $v)"
grub_background="background1280x800.png" grub_background="background1280x800.png"
board="$1" board="$1"
configure_target configure_target
[ "$board" = "$tree" ] && return 0 [ "$board" = "$tree" ] && return 0
if [ "$xbmk_release" = "y" ] && [ "$release" = "n" ]; then [ "$xbmk_release" = "y" ] && [ "$release" = "n" ] && return 0
printf "Target '%s' disabled for release.\n" "$board"
return 0
fi
build_payloads build_payloads
build_target_mainboard build_target_mainboard
[ -d "bin/${board}" ] || return 0 [ -d "bin/$board" ] || return 0
[ "$xbmk_release" = "y" ] || targets="* bin/${board}\n${targets}" [ "$xbmk_release" = "y" ] || targets="* bin/$board\n$targets"
[ "$xbmk_release" = "y" ] && mkrom_tarball "bin/$board" && \ [ "$xbmk_release" = "y" ] && mkrom_tarball "bin/$board" && \
targets="* bin/${relname}_$board.tar.xz\n$targets"; return 0 targets="* bin/${relname}_$board.tar.xz\n$targets"; return 0
} }
configure_target() configure_target()
{ {
targetdir="${cfgsdir}/${board}" targetdir="$cfgsdir/$board"
[ -f "${targetdir}/target.cfg" ] || \ [ -f "$targetdir/target.cfg" ] || $err "$board: target.cfg missing"
$err "Missing target.cfg for target: ${board}"
# Override the above defaults using target.cfg # Override the above defaults using target.cfg
. "${targetdir}/target.cfg" . "$targetdir/target.cfg"
[ -z "${grub_scan_disk}" ] && grub_scan_disk="both" [ -z "$grub_scan_disk" ] && grub_scan_disk="both"
[ "$grub_scan_disk" != "both" ] && [ "$grub_scan_disk" != "ata" ] \ [ "$grub_scan_disk" != "both" ] && [ "$grub_scan_disk" != "ata" ] && \
&& [ "${grub_scan_disk}" != "ahci" ] && \ [ "$grub_scan_disk" != "ahci" ] && grub_scan_disk="both"
grub_scan_disk="both"
[ -z "$tree" ] && $err "$board: tree not defined" [ -z "$tree" ] && $err "$board: tree not defined"
[ "${payload_memtest}" != "y" ] && payload_memtest="n" [ "$payload_memtest" != "y" ] && payload_memtest="n"
[ "$(uname -m)" = "x86_64" ] || payload_memtest="n" [ "$(uname -m)" = "x86_64" ] || payload_memtest="n"
[ "${payload_grub_withseabios}" = "y" ] && payload_grub="y" [ "$payload_grub_withseabios" = "y" ] && payload_grub="y"
[ "${payload_grub_withseabios}" = "y" ] && \ [ "$payload_grub_withseabios" = "y" ] && \
eval "$(setvars "y" payload_seabios payload_seabios_withgrub)" eval "$(setvars "y" payload_seabios payload_seabios_withgrub)"
[ "$payload_seabios_withgrub" = "y" ] && payload_seabios="y" [ "$payload_seabios_withgrub" = "y" ] && payload_seabios="y"
[ "$payload_seabios_grubonly" = "y" ] && payload_seabios="y" [ "$payload_seabios_grubonly" = "y" ] && payload_seabios="y"
@ -183,8 +169,7 @@ configure_target()
# The reverse logic must not be applied. If SeaBIOS-with-GRUB works, # The reverse logic must not be applied. If SeaBIOS-with-GRUB works,
# that doesn't mean GRUB-with-SeaBIOS will, e.g. VGA ROM execution # that doesn't mean GRUB-with-SeaBIOS will, e.g. VGA ROM execution
[ "$payload_grub" != "y" ] && [ "$payload_seabios" != "y" ] && \ [ "$payload_grub" != "y" ] && [ "$payload_seabios" != "y" ] && \
[ "${payload_uboot}" != "y" ] && \ [ "$payload_uboot" != "y" ] && $err "'$board' defines no payload"
$err "target '$board' defines no payload"
[ "$payload_uboot" != "n" ] && [ "$payload_uboot" != "y" ] && \ [ "$payload_uboot" != "n" ] && [ "$payload_uboot" != "y" ] && \
payload_uboot="n" payload_uboot="n"
@ -192,32 +177,32 @@ configure_target()
uboot_config="default" uboot_config="default"
# Override all payload directives with cmdline args # Override all payload directives with cmdline args
[ -z "${_payload}" ] && return 0 [ -z "$_payload" ] && return 0
eval "$(setvars "n" payload_grub payload_memtest payload_seabios \ eval "$(setvars "n" payload_grub payload_memtest payload_seabios \
payload_seabios_withgrub payload_uboot payload_grub_withseabios \ payload_seabios_withgrub payload_uboot payload_grub_withseabios \
payload_seabios_grubonly)" payload_seabios_grubonly)"
eval "payload_${_payload}=y" eval "payload_$_payload=y"
} }
build_payloads() build_payloads()
{ {
romdir="bin/${board}" romdir="bin/$board"
cbdir="src/coreboot/${board}" cbdir="src/coreboot/$board"
[ "${board}" = "${tree}" ] || cbdir="src/coreboot/${tree}" [ "$board" = "$tree" ] || cbdir="src/coreboot/$tree"
cbfstool="cbutils/${tree}/cbfstool" cbfstool="cbutils/$tree/cbfstool"
cbrom="${cbdir}/build/coreboot.rom" cbrom="$cbdir/build/coreboot.rom"
[ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree [ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree
memtest_bin="memtest86plus/build64/memtest.bin" mt86bin="memtest86plus/build64/memtest.bin"
[ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ [ "$payload_memtest" != "y" ] || [ -f "src/$mt86bin" ] || \
x_ ./update trees -b memtest86plus x_ ./update trees -b memtest86plus
[ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios [ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios
if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \ if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \
|| [ "$payload_seabios_grubonly" = "y" ]; then build_grub_payload || [ "$payload_seabios_grubonly" = "y" ]; then build_grub_payload
fi fi
[ "${payload_uboot}" = "y" ] && build_uboot_payload; return 0 [ "$payload_uboot" = "y" ] && build_uboot_payload; return 0
} }
build_grub_payload() build_grub_payload()
@ -225,227 +210,215 @@ build_grub_payload()
x_ mkdir -p elf/grub x_ mkdir -p elf/grub
for keymapfile in config/grub/keymap/*.gkb; do for keymapfile in config/grub/keymap/*.gkb; do
[ -f "${keymapfile}" ] || continue [ -f "$keymapfile" ] && keymaps="$keymaps $keymapfile"
keymaps="${keymaps} ${keymapfile}"
done done
[ -z "$_keyboard" ] || [ -f "$grubcfgsdir/keymap/$_keyboard.gkb" ] || \ [ -z "$_keyboard" ] || [ -f "$grubcfgsdir/keymap/$_keyboard.gkb" ] || \
$err "build_grub_payload: $_keyboard layout not defined" $err "build_grub_payload: $_keyboard layout not defined"
[ -n "$_keyboard" ] && keymaps="${grubcfgsdir}/keymap/${_keyboard}.gkb" [ -n "$_keyboard" ] && keymaps="$grubcfgsdir/keymap/$_keyboard.gkb"
[ -f "$grubelf" ] && return 0 [ -f "$grubelf" ] && return 0
[ -f "src/grub/grub-mkstandalone" ] || x_ ./update trees -b grub [ -f "src/grub/grub-mkstandalone" ] || x_ ./update trees -b grub
./src/grub/grub-mkstandalone --grub-mkimage="src/grub/grub-mkimage" \ ./src/grub/grub-mkstandalone --grub-mkimage="src/grub/grub-mkimage" \
-O i386-coreboot -o "elf/grub/grub.elf" -d "src/grub/grub-core/" \ -O i386-coreboot -o "elf/grub/grub.elf" -d "src/grub/grub-core/" \
--fonts= --themes= --locales= --modules="${grub_modules}" \ --fonts= --themes= --locales= --modules="$grub_modules" \
--install-modules="${grub_install_modules}" \ --install-modules="$grub_install_modules" \
"/boot/grub/grub.cfg=${grubcfgsdir}/config/grub_memdisk.cfg" \ "/boot/grub/grub.cfg=$grubcfgsdir/config/grub_memdisk.cfg" \
"/boot/grub/grub_default.cfg=${grubcfgsdir}/config/grub.cfg" || \ "/boot/grub/grub_default.cfg=$grubcfgsdir/config/grub.cfg" || \
$err "could not generate grub.elf" $err "could not generate grub.elf"
} }
build_uboot_payload() build_uboot_payload()
{ {
x_ ./update trees -b u-boot ${board} x_ ./update trees -b u-boot $board
ubdir="elf/u-boot/${board}/${uboot_config}" ubdir="elf/u-boot/$board/$uboot_config"
ubootelf="${ubdir}/u-boot.elf" ubootelf="$ubdir/u-boot.elf"
[ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot" ] && \ [ ! -f "$ubootelf" ] && [ -f "$ubdir/u-boot" ] && \
ubootelf="${ubdir}/u-boot" ubootelf="$ubdir/u-boot"
[ -f "${ubootelf}" ] || $err "$board: Can't find u-boot"; return 0 [ -f "$ubootelf" ] || $err "$board: Can't find u-boot"; return 0
} }
build_target_mainboard() build_target_mainboard()
{ {
x_ rm -Rf "${romdir}" x_ rm -Rf "$romdir"
for x in "normal" "vgarom" "libgfxinit"; do for x in "normal" "vgarom" "libgfxinit"; do
initmode="${x}" initmode="$x"
hmode="vesafb" hmode="vesafb"
[ "${initmode}" = "vgarom" ] || hmode="corebootfb" [ "$initmode" = "vgarom" ] || hmode="corebootfb"
modes="${hmode} txtmode" modes="$hmode txtmode"
[ -z "${_displaymode}" ] || modes="${_displaymode}" [ -z "$_displaymode" ] || modes="$_displaymode"
for y in ${modes}; do for y in $modes; do
displaymode="${y}" displaymode="$y"
[ "${initmode}" = "normal" ] && \ [ "$initmode" = "normal" ] && \
[ "$displaymode" != "txtmode" ] && continue [ "$displaymode" != "txtmode" ] && continue
cbcfg="${targetdir}/config/${initmode}_${displaymode}" cbcfg="$targetdir/config/${initmode}_$displaymode"
[ "${initmode}" = "normal" ] && cbcfg="${cbcfg%_*}" [ "$initmode" = "normal" ] && cbcfg="${cbcfg%_*}"
build_roms "${cbcfg}" build_roms "$cbcfg"; x_ rm -f "$cbrom"
x_ rm -f "$cbrom"
done done
done done
} }
build_roms() build_roms()
{ {
cbcfg="${1}" cbcfg="$1"
if [ ! -f "${cbcfg}" ]; then e "$cbcfg" f not && return 0
printf "'%s' does not exist. Skipping build for %s %s %s\n" \
"$cbcfg" "$board" "$displaymode" "$initmode" 1>&2
return 0
fi
x_ ./update trees -b coreboot ${board} x_ ./update trees -b coreboot $board
_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH" _cbrom="elf/coreboot_nopayload_DO_NOT_FLASH"
_cbrom="${_cbrom}/${board}/${initmode}_${displaymode}" _cbrom="$_cbrom/$board/${initmode}_$displaymode"
[ "${initmode}" = "normal" ] && \ [ "$initmode" = "normal" ] && _cbrom="${_cbrom%"_$displaymode"}"
_cbrom="${_cbrom%"_${displaymode}"}" _cbrom="$_cbrom/coreboot.rom"
_cbrom="${_cbrom}/coreboot.rom"
cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
x_ cp "${_cbrom}" "${cbrom}" x_ cp "$_cbrom" "$cbrom"
[ "${payload_memtest}" != "y" ] || \ [ "$payload_memtest" != "y" ] || x_ "$cbfstool" "$cbrom" add-payload \
x_ "${cbfstool}" "${cbrom}" add-payload \ -f "src/$mt86bin" -n img/memtest -c lzma
-f "src/${memtest_bin}" -n img/memtest -c lzma [ "$payload_seabios" = "y" ] && build_seabios_roms
[ "${payload_seabios}" = "y" ] && build_seabios_roms
[ "$payload_grub" != "y" ] || x_ build_grub_roms "$cbrom" "grub" [ "$payload_grub" != "y" ] || x_ build_grub_roms "$cbrom" "grub"
[ "${payload_uboot}" = "y" ] || return 0 [ "$payload_uboot" = "y" ] || return 0
x_ cp "${_cbrom}" "${cbrom}" x_ cp "$_cbrom" "$cbrom"
build_uboot_roms build_uboot_roms
} }
build_seabios_roms() build_seabios_roms()
{ {
if [ "${payload_seabios_withgrub}" = "y" ]; then if [ "$payload_seabios_withgrub" = "y" ]; then
t=$(mktemp -t coreboot_rom.XXXXXXXXXX) t="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
x_ cp "${cbrom}" "${t}" x_ cp "$cbrom" "$t"
x_ build_grub_roms "${t}" "seabios_withgrub" x_ build_grub_roms "$t" "seabios_withgrub"
else else
t=$(mkSeabiosRom "${cbrom}" "fallback/payload") || \ t="$(mkSeabiosRom "$cbrom" "fallback/payload")" || \
$err "build_seabios_roms: cannot build tmprom" $err "build_seabios_roms: cannot build tmprom"
newrom="${romdir}/seabios_${board}_${initmode}_${displaymode}" newrom="$romdir/seabios_${board}_${initmode}_$displaymode"
[ "${initmode}" = "normal" ] && newrom="${romdir}/seabios" \ [ "$initmode" = "normal" ] && newrom="$romdir/seabios" \
&& newrom="${newrom}_${board}_${initmode}" && newrom="${newrom}_${board}_$initmode"
x_ copyrom "${t}" "${newrom}.rom" x_ cprom "$t" "$newrom.rom"
fi fi
x_ rm -f "${t}" x_ rm -f "$t"
} }
# Make separate ROM images with GRUB payload, for each supported keymap # Make separate ROM images with GRUB payload, for each supported keymap
build_grub_roms() build_grub_roms()
{ {
tmprom="${1}" tmprom="$1"
payload1="${2}" # allow values: grub, seabios, seabios_withgrub payload1="$2" # allow values: grub, seabios, seabios_withgrub
grub_cbfs="fallback/payload" grub_cbfs="fallback/payload"
if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ] if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ]
then then
_tmpmvrom=$(mkSeabiosRom "$tmprom" "seabios.elf") || \ _tmpmvrom="$(mkSeabiosRom "$tmprom" "seabios.elf")" || \
$err "build_grub_roms 1 $board: can't build tmprom" $err "build_grub_roms 1 $board: can't build tmprom"
x_ mv "$_tmpmvrom" "$tmprom" x_ mv "$_tmpmvrom" "$tmprom"
elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ] elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ]
then then
grub_cbfs="img/grub2" grub_cbfs="img/grub2"
_tmpmvrom=$(mkSeabiosRom "$tmprom" fallback/payload) || \ _tmpmvrom="$(mkSeabiosRom "$tmprom" fallback/payload)" || \
$err "build_grub_roms 2 $board: can't build tmprom" $err "build_grub_roms 2 $board: can't build tmprom"
x_ mv "$_tmpmvrom" "$tmprom" x_ mv "$_tmpmvrom" "$tmprom"
fi fi
# we only need insert grub.elf once, for each coreboot config: # we only need insert grub.elf once, for each coreboot config:
x_ "${cbfstool}" "${tmprom}" add-payload -f "${grubelf}" \ x_ "$cbfstool" "$tmprom" add-payload -f "$grubelf" \
-n ${grub_cbfs} -c lzma -n "$grub_cbfs" -c lzma
# we only need insert background.png once, for each coreboot config: # we only need insert background.png once, for each coreboot config:
if [ "${displaymode}" = "vesafb" ] || \ if [ "$displaymode" = "vesafb" ] || \
[ "${displaymode}" = "corebootfb" ]; then [ "$displaymode" = "corebootfb" ]; then
backgroundfile="config/grub/background/${grub_background}" backgroundfile="config/grub/background/$grub_background"
"${cbfstool}" "${tmprom}" add -f ${backgroundfile} \ "$cbfstool" "$tmprom" add -f "$backgroundfile" -n \
-n background.png -t raw || \ background.png -t raw || $err "!bg, $backgroundfile"
$err "insert background, ${backgroundfile}"
fi fi
tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) tmpcfg="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" >"$tmpcfg" \ printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" > "$tmpcfg" || \
|| $err "set grub_scandisk, $grub_scan_disk, $tmpcfg" $err "set grub_scandisk, $grub_scan_disk, $tmpcfg"
[ "${grub_scan_disk}" = "both" ] || \ [ "$grub_scan_disk" = "both" ] || \
x_ "$cbfstool" "$tmprom" add -f "$tmpcfg" -n scan.cfg -t raw x_ "$cbfstool" "$tmprom" add -f "$tmpcfg" -n scan.cfg -t raw
printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" || \ printf "set timeout=%s\n" "$grub_timeout" > "$tmpcfg" || \
$err "set timeout, ${grub_timeout}, ${tmpcfg}" $err "set timeout, $grub_timeout, $tmpcfg"
[ -z "${grub_timeout}" ] || x_ "${cbfstool}" "${tmprom}" add \ [ -z "$grub_timeout" ] || x_ "$cbfstool" "$tmprom" add \
-f "${tmpcfg}" -n timeout.cfg -t raw -f "$tmpcfg" -n timeout.cfg -t raw
x_ rm -f "${tmpcfg}" x_ rm -f "$tmpcfg"
for keymapfile in ${keymaps}; do for keymapfile in $keymaps; do
[ -f "${keymapfile}" ] || continue [ -f "$keymapfile" ] || continue
keymap="${keymapfile##*/}" keymap="${keymapfile##*/}"
keymap="${keymap%.gkb}" keymap="${keymap%.gkb}"
tmpgrubrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" tmpgrubrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
x_ cp "${tmprom}" "${tmpgrubrom}" x_ cp "$tmprom" "$tmpgrubrom"
x_ "$cbfstool" "$tmpgrubrom" add -f "$keymapfile" \ x_ "$cbfstool" "$tmpgrubrom" add -f "$keymapfile" \
-n keymap.gkb -t raw -n keymap.gkb -t raw
newrom="${romdir}/${payload1}_${board}_${initmode}_" newrom="$romdir/${payload1}_${board}_${initmode}_"
newrom="${newrom}${displaymode}_${keymap}.rom" newrom="$newrom${displaymode}_$keymap.rom"
[ "${initmode}" = "normal" ] && \ [ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \
newrom="${romdir}/${payload1}_${board}_" && \ && newrom="$newrom${board}_${initmode}_$keymap.rom"
newrom="${newrom}${initmode}_${keymap}.rom" x_ cprom "$tmpgrubrom" "$newrom"
x_ copyrom "${tmpgrubrom}" "${newrom}" if [ "$payload_seabios_grubonly" = "y" ]; then
if [ "${payload_seabios_grubonly}" = "y" ]; then
x_ "$cbfstool" "$tmpgrubrom" add \ x_ "$cbfstool" "$tmpgrubrom" add \
-f "config/grub/bootorder" -n bootorder -t raw -f "config/grub/bootorder" -n bootorder -t raw
x_ copyrom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom" x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \ x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \
-n etc/show-boot-menu -n etc/show-boot-menu
x_ copyrom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom" x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom"
fi fi
x_ rm -f "${tmpgrubrom}" x_ rm -f "$tmpgrubrom"
done done
} }
# make a rom in /tmp/ and then print the path of that ROM # make a rom in /tmp/ and then print the path of that ROM
mkSeabiosRom() { mkSeabiosRom() {
_cbrom="${1}" # rom to insert seabios in. will not be touched _cbrom="$1" # rom to insert seabios in. will not be touched
# (a tmpfile will be made instead) # (a tmpfile will be made instead)
_seabios_cbfs_path="${2}" # e.g. fallback/payload _seabios_cbfs_path="$2" # e.g. fallback/payload
_seabioself="elf/seabios/default/${initmode}/bios.bin.elf" _seabioself="elf/seabios/default/$initmode/bios.bin.elf"
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
x_ cp "${_cbrom}" "${tmprom}" x_ cp "$_cbrom" "$tmprom"
x_ "$cbfstool" "$tmprom" add-payload -f "$_seabioself" \ x_ "$cbfstool" "$tmprom" add-payload -f "$_seabioself" \
-n "${_seabios_cbfs_path}" -c lzma -n "$_seabios_cbfs_path" -c lzma
x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup
z="2"; [ "$initmode" = "vgarom" ] && z="0" z="2"; [ "$initmode" = "vgarom" ] && z="0"
x_ "$cbfstool" "$tmprom" add-int -i $z -n etc/pci-optionrom-exec x_ "$cbfstool" "$tmprom" add-int -i $z -n etc/pci-optionrom-exec
x_ "$cbfstool" "$tmprom" add-int -i 0 -n etc/optionroms-checksum x_ "$cbfstool" "$tmprom" add-int -i 0 -n etc/optionroms-checksum
[ "$initmode" != "libgfxinit" ] || \ [ "$initmode" != "libgfxinit" ] || x_ "$cbfstool" "$tmprom" add -f \
x_ "$cbfstool" "$tmprom" add -f "$seavgabiosrom" \ "$seavgabiosrom" -n vgaroms/seavgabios.bin -t raw
-n vgaroms/seavgabios.bin -t raw
printf "%s\n" "${tmprom}" printf "%s\n" "$tmprom"
} }
build_uboot_roms() build_uboot_roms()
{ {
tmprom=$(mkUbootRom "${cbrom}" "fallback/payload") || \ tmprom="$(mkUbootRom "$cbrom" "fallback/payload")" || \
$err "build_uboot_roms $board: could not create tmprom" $err "build_uboot_roms $board: could not create tmprom"
newrom="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom" newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom"
x_ copyrom "${tmprom}" "${newrom}" x_ cprom "$tmprom" "$newrom"
x_ rm -f "${tmprom}" x_ rm -f "$tmprom"
} }
# make a rom in /tmp/ and then print the path of that ROM # make a rom in /tmp/ and then print the path of that ROM
mkUbootRom() { mkUbootRom() {
_cbrom="${1}" _cbrom="$1"
_uboot_cbfs_path="${2}" _uboot_cbfs_path="$2"
_ubdir="elf/u-boot/${board}/${uboot_config}" _ubdir="elf/u-boot/$board/$uboot_config"
_ubootelf="${_ubdir}/u-boot.elf" _ubootelf="$_ubdir/u-boot.elf"
[ -f "${_ubootelf}" ] || _ubootelf="${_ubdir}/u-boot" [ -f "$_ubootelf" ] || _ubootelf="$_ubdir/u-boot"
[ -f "$_ubootelf" ] || $err "mkUbootRom: $board: cant find u-boot" [ -f "$_ubootelf" ] || $err "mkUbootRom: $board: cant find u-boot"
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
x_ cp "${_cbrom}" "${tmprom}" x_ cp "$_cbrom" "$tmprom"
x_ "$cbfstool" "$tmprom" add-payload -f "$_ubootelf" \ x_ "$cbfstool" "$tmprom" add-payload -f "$_ubootelf" \
-n "${_uboot_cbfs_path}" -c lzma -n "$_uboot_cbfs_path" -c lzma
printf "%s\n" "${tmprom}" printf "%s\n" "$tmprom"
} }
copyrom() cprom()
{ {
printf "Creating target image: %s\n" "$2" printf "Creating target image: %s\n" "$2"

145
script/trees
View File

@ -1,8 +1,8 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com> # Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# SPDX-FileCopyrightText: 2023-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org>
set -u -e set -u -e
@ -10,15 +10,15 @@ set -u -e
. "include/git.sh" . "include/git.sh"
. "include/deblob.sh" . "include/deblob.sh"
eval "$(setvars "" xarch cfgsdir codedir config config_name xlang mode \ eval "$(setvars "" xarch cfgsdir cdir config config_name xlang mode makeargs \
elfdir listfile project target target_dir targets tree _f target1 \ listfile project target target_dir targets tree _f target1 bootstrapargs \
bootstrapargs autoconfargs cmakedir makeargs autogenargs xtree)" autoconfargs cmakedir elfdir autogenargs xtree)"
main() main()
{ {
while getopts f:b:m:u:c:x:s:l:n: option; do while getopts f:b:m:u:c:x:s:l:n: option; do
_f="${1}" _f="$1"
case "${1}" in case "$1" in
-b) : ;; -b) : ;;
-u) mode="oldconfig" ;; -u) mode="oldconfig" ;;
-m) mode="menuconfig" ;; -m) mode="menuconfig" ;;
@ -34,13 +34,13 @@ main()
done done
[ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)" [ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)"
[ -z "$project" ] && $err "project name not specified" [ -z "$project" ] && $err "project name not specified"
elfdir="elf/${project}" elfdir="elf/$project"
cfgsdir="config/${project}" cfgsdir="config/$project"
remkdir "${tmpgit%/*}" remkdir "${tmpgit%/*}"
_cmd="build_projects" _cmd="build_projects"
[ -f "config/${project}/build.list" ] && _cmd="build_targets" [ -f "config/$project/build.list" ] && _cmd="build_targets"
$_cmd $@ $_cmd $@
} }
@ -53,8 +53,8 @@ build_projects()
load_project_config "$cfgsdir" load_project_config "$cfgsdir"
codedir="src/${project}" cdir="src/${project}"
[ -d "$codedir" ] || x_ ./update trees -f "$project" [ -d "$cdir" ] || x_ ./update trees -f "$project"
[ "$mode" = "distclean" ] && mode="clean" [ "$mode" = "distclean" ] && mode="clean"
run_make_command || return 0 run_make_command || return 0
@ -67,15 +67,13 @@ build_targets()
[ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist" [ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist"
listfile="${cfgsdir}/build.list" listfile="$cfgsdir/build.list"
[ -f "$listfile" ] || $err "list file, $listfile, does not exist" [ -f "$listfile" ] || $err "list file, $listfile, does not exist"
# Build for all targets if no argument is given # Build for all targets if no argument is given
[ $# -gt 0 ] && target1="$1" [ $# -gt 0 ] && target1="$1"
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \ [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && shift 1
shift 1 targets="$(items "$cfgsdir")" || $err "Can't get options for $cfgsdir"
targets=$(items "$cfgsdir") || \
$err "Cannot get options for $cfgsdir"
[ $# -gt 0 ] && targets=$@ [ $# -gt 0 ] && targets=$@
[ -z "$mode" ] && x_ mkdir -p "$elfdir" [ -z "$mode" ] && x_ mkdir -p "$elfdir"
@ -85,14 +83,13 @@ build_targets()
handle_targets() handle_targets()
{ {
for x in $targets; do for x in $targets; do
target="${x}" target="$x"
printf "Running 'make %s' for project '%s, target '%s''\n" \ printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target"
"$mode" "$project" "$target"
x_ handle_defconfig x_ handle_defconfig
done done
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0
[ -z "${mode}" ] && printf "Done! Check %s/\n\n" "$elfdir"; return 0 [ -z "$mode" ] && printf "Done! Check %s/\n\n" "$elfdir"; return 0
} }
handle_defconfig() handle_defconfig()
@ -102,13 +99,10 @@ handle_defconfig()
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \ [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \
eval "handle_coreboot_utils \"$tree\"; return 0" eval "handle_coreboot_utils \"$tree\"; return 0"
for y in "${target_dir}/config"/*; do for y in "$target_dir/config"/*; do
[ -f "$y" ] || continue [ -f "$y" ] || continue
config="$y" config="$y"
config_name="${config#"${target_dir}/config/"}" config_name="${config#"$target_dir/config/"}"
printf "handle/make/config %s %s: handling config %s\n" \
"$project" "$target" "$config_name"
[ -n "$mode" ] || check_config || continue [ -n "$mode" ] || check_config || continue
handle_makefile handle_makefile
@ -118,23 +112,20 @@ handle_defconfig()
handle_src_tree() handle_src_tree()
{ {
target_dir="${cfgsdir}/${target}" target_dir="$cfgsdir/$target"
[ "$mode" = "fetch" ] && [ ! -f "CHANGELOG" ] && \ [ "$mode" = "fetch" ] && [ ! -f "CHANGELOG" ] && \
eval "fetch_project_trees; return 1;" eval "fetch_project_trees; return 1;"
load_project_config "$target_dir" load_project_config "$target_dir"
x_ mkdir -p "$elfdir/$target"
x_ mkdir -p "${elfdir}/${target}"
[ -z "$tree" ] && $err "handle_src_tree $project/$tree: tree unset" [ -z "$tree" ] && $err "handle_src_tree $project/$tree: tree unset"
cdir="src/$project/$tree"
codedir="src/${project}/${tree}" if [ ! -d "$cdir" ]; then
if [ ! -d "$codedir" ]; then
if [ "$mode" = "distclean" ] || \ if [ "$mode" = "distclean" ] || \
[ "$mode" = "crossgcc-clean" ]; then [ "$mode" = "crossgcc-clean" ]; then
printf "Directory %s missing; skipping clean\n" \ printf "Directory %s missing; skip\n" "$cdir" 1>&2
"$codedir" 1>&2
return 1 return 1
fi fi
x_ ./update trees -f "$project" "$target" x_ ./update trees -f "$project" "$target"
@ -146,28 +137,27 @@ handle_src_tree()
load_project_config() load_project_config()
{ {
eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs \ eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \
xtree tree_depend makeargs)" tree_depend makeargs)"
[ -f "${1}/target.cfg" ] || return 0 [ -f "$1/target.cfg" ] || return 0
. "${1}/target.cfg" || \ . "$1/target.cfg" || $err "loadp $1: can't load target.cfg"; return 0
$err "load_project_config ${1}: cannot load target.cfg"; return 0
} }
check_cross_compiler() check_cross_compiler()
{ {
for _xarch in $xarch; do for _xarch in $xarch; do
cbdir="src/coreboot/${tree}" cbdir="src/coreboot/$tree"
[ "$project" != "coreboot" ] && cbdir="src/coreboot/default" [ "$project" != "coreboot" ] && cbdir="src/coreboot/default"
[ -n "$xtree" ] && cbdir="src/coreboot/$xtree" [ -n "$xtree" ] && cbdir="src/coreboot/$xtree"
x_ ./update trees -f coreboot ${cbdir#src/coreboot/} x_ ./update trees -f coreboot ${cbdir#src/coreboot/}
export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH" export PATH="$PWD/$cbdir/util/crossgcc/xgcc/bin:$PATH"
export CROSS_COMPILE="${xarch% *}-" export CROSS_COMPILE="${xarch% *}-"
[ -n "${xlang}" ] && export BUILD_LANGUAGES="$xlang" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang"
[ -d "${cbdir}/util/crossgcc/xgcc/${_xarch}/" ] && continue [ -d "$cbdir/util/crossgcc/xgcc/$_xarch/" ] && continue
x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$threads \ x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$threads \
UPDATED_SUBMODULES=1 UPDATED_SUBMODULES=1
done done
@ -175,89 +165,78 @@ check_cross_compiler()
check_config() check_config()
{ {
[ -f "$config" ] || $err "check_config: ${project}/${target}: no config" [ -f "$config" ] || $err "check_config $project/$target: no config"
dest_dir="${elfdir}/${target}/${config_name}" dest_dir="$elfdir/$target/$config_name"
# TODO: very hacky check. do it properly (based on build.list) # TODO: very hacky check. do it properly (based on build.list)
for elftest in "${dest_dir}"/*; do for elftest in "$dest_dir"/*; do
[ -f "$elftest" ] || continue e "$elftest" f && return 1
printf "Build already exists, so skipping build\n" 1>&2
return 1
done done
x_ mkdir -p "$dest_dir" x_ mkdir -p "$dest_dir"
} }
handle_makefile() handle_makefile()
{ {
x_ make clean -C "$codedir" x_ make clean -C "$cdir" && x_ cp "$config" "$cdir/.config"
x_ cp "$config" "${codedir}/.config" [ -n "$mode" ] || make -C "$cdir" silentoldconfig || \
[ -n "$mode" ] || make -C "$codedir" silentoldconfig || \ make -C "$cdir" oldconfig || :
make -C "$codedir" oldconfig || :
run_make_command || $err "handle_makefile $codedir: no makefile!" run_make_command || $err "handle_makefile $cdir: no makefile!"
_copy=".config" _copy=".config"
[ "$mode" = "savedefconfig" ] && _copy="defconfig" [ "$mode" = "savedefconfig" ] && _copy="defconfig"
[ "${mode%config}" = "$mode" ] || x_ cp "$codedir/$_copy" "$config" [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config"
[ -e "${codedir}/.git" ] && [ "$project" = "u-boot" ] && \ [ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \
[ "$mode" = "distclean" ] && \ [ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0
x_ git -C "$codedir" clean -fdx; return 0
} }
run_make_command() run_make_command()
{ {
check_cmake "$codedir" check_cmake "$cdir"
[ -z "$mode" ] && check_autoconf "$codedir" [ -z "$mode" ] && check_autoconf "$cdir"
check_makefile "$codedir" || return 1 check_makefile "$cdir" || return 1
[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \
printf "%s\n" "${version%%-*}" > "$codedir/.coreboot-version" printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \
&& makeargs="$makeargs UPDATED_SUBMODULES=1"
[ "$project" = "coreboot" ] && \ make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode"
makeargs="$makeargs UPDATED_SUBMODULES=1"
make -C "$codedir" $mode -j$threads $makeargs || \
$err "run_make $codedir: !make $mode"
[ "$mode" != "clean" ] && return 0 [ "$mode" != "clean" ] && return 0
make -C "$codedir" distclean 2>/dev/null || : make -C "$cdir" distclean 2>/dev/null || :
} }
check_cmake() check_cmake()
{ {
[ -z "${cmakedir}" ] || \ [ -z "$cmakedir" ] || check_makefile "$1" || cmake -B "$1" \
check_makefile "${1}" || \ "$1/$cmakedir" || check_makefile "$1" || $err "$1: !cmk $cmakedir"
cmake -B "${1}" "${1}/${cmakedir}" || \ [ -z "$cmakedir" ] || check_makefile "$1" || \
check_makefile "${1}" || \ $err "check_cmake $1: can't generate Makefile"; return 0
$err "check_cmake ${1}: can't cmake ${cmakedir}"
[ -z "${cmakedir}" ] || check_makefile "${1}" || \
$err "check_cmake ${1}: can't generate Makefile"; return 0
} }
check_autoconf() check_autoconf()
{ {
( (
cd "${1}" || $err "!cd $1" cd "$1" || $err "!cd $1"
[ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs [ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs
[ -f "autogen.sh" ] && x_ ./autogen.sh ${autogenargs} [ -f "autogen.sh" ] && x_ ./autogen.sh $autogenargs
[ -f "configure" ] && x_ ./configure $autoconfargs; return 0 [ -f "configure" ] && x_ ./configure $autoconfargs; return 0
) || $err "can't bootstrap project: $1" ) || $err "can't bootstrap project: $1"
} }
check_makefile() check_makefile()
{ {
[ -f "${1}/Makefile" ] || [ -f "${1}/makefile" ] || \ [ -f "$1/Makefile" ] || [ -f "$1/makefile" ] || \
[ -f "${1}/GNUmakefile" ] || return 1; return 0 [ -f "$1/GNUmakefile" ] || return 1; return 0
} }
copy_elf() copy_elf()
{ {
while read -r f; do while read -r f; do
[ ! -f "${codedir}/$f" ] || \ [ -f "$cdir/$f" ] && x_ cp "$cdir/$f" "$dest_dir"
x_ cp "${codedir}/${f}" "$dest_dir"
done < "$listfile" done < "$listfile"
x_ make clean -C "$codedir" x_ make clean -C "$cdir"
} }
main $@ main $@