diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/git.sh | 13 | ||||
| -rw-r--r-- | include/init.sh | 254 | ||||
| -rw-r--r-- | include/inject.sh (renamed from include/vendor.sh) | 1 | ||||
| -rw-r--r-- | include/lib.sh | 249 | ||||
| -rw-r--r-- | include/rom.sh | 14 |
5 files changed, 299 insertions, 232 deletions
diff --git a/include/git.sh b/include/git.sh index 9712ed37..9be79527 100644 --- a/include/git.sh +++ b/include/git.sh @@ -9,8 +9,6 @@ tmpgit="$xbmkpwd/tmp/gitclone" fetch_targets() { - [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ - x_ ./mk -f "$project" "$tree_depend" e "src/$project/$tree" d && return 0 printf "Creating %s tree %s\n" "$project" "$tree" @@ -21,7 +19,7 @@ fetch_targets() fetch_project() { - eval "`setvars "" xtree tree_depend`" + eval "`setvars "" xtree`" eval "`setcfg "config/git/$project/pkg.cfg"`" chkvars url @@ -68,6 +66,15 @@ git_prep() mv "$tmpgit" "$_loc" || $err "git_prep: !mv $tmpgit $_loc" } +# return 0 if project is single-tree, otherwise 1 +# e.g. coreboot is multi-tree, so 1 +singletree() +{ + for targetfile in "config/${1}/"*/target.cfg; do + [ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1; : + done; : +} + fetch_submodule() { mcfgdir="$mdir/${1##*/}"; eval \ diff --git a/include/init.sh b/include/init.sh new file mode 100644 index 00000000..a88bd13f --- /dev/null +++ b/include/init.sh @@ -0,0 +1,254 @@ +# 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-2025 Leah Rowe <leah@libreboot.org> +# Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com> + +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" + +err="err_" + +setvars() +{ + _setvars="" + if [ $# -lt 2 ]; then + printf "\$err \"setvars: too few args\\n\"" + return 0 + fi + 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 +} + +eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ + datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver`" + +xbmk_init() +{ + xbmkpwd="`pwd`" || $err "Cannot generate PWD" + export PWD="$xbmkpwd" + + 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" + + for init_cmd in set_pyver set_env set_version git_init create_tmpdir \ + lock create_pathdirs child_exec; do + xbmk_$init_cmd "$@" || break + done +} + +install_packages() +{ + [ $# -lt 2 ] && $err "fewer than two arguments" + [ $# -gt 2 ] && reinstall="$3" + + eval "`setcfg "config/dependencies/$2"`" + + chkvars pkg_add pkglist + $pkg_add $pkglist || $err "Cannot install packages" + + [ -n "$aur_notice" ] && \ + printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; : +} + +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" +} + +chkvars() +{ + for var in "$@"; do + eval "[ -n \"\${$var+x}\" ] || \$err \"$var unset\"" + eval "[ -n \"\$$var\" ] || \$err \"$var unset\"" + done; : +} + +xbmk_set_pyver() +{ + pyv="import sys; print(sys.version_info[:])" + python="python3" + pybin python3 1>/dev/null || python="python" + pyver="2" && [ "$python" = "python3" ] && pyver="3" + pybin "$python" 1>/dev/null || pyver="" + [ -z "$pyver" ] || "`pybin "$python"`" -c "$pyv" 1>/dev/null \ + 2>/dev/null || $err "Cannot detect host Python version." + if [ -n "$pyver" ]; then + pyver="$("$(pybin "$python")" -c "$pyv" | awk '{print $1}')" + pyver="${pyver#(}" + pyver="${pyver%,}" + fi + [ "${pyver%%.*}" = "3" ] || $err "Bad python version (must by 3.x)"; : +} + +# Use direct path, to prevent a hang if Python is using a virtual environment, +# not command -v, to prevent a hang when checking python's version +# See: https://docs.python.org/3/library/venv.html#how-venvs-work +pybin() +{ + py="import sys; quit(1) if sys.prefix == sys.base_prefix else quit(0)" + + venv=1 + command -v "$1" 1>/dev/null 2>/dev/null || venv=0 + [ $venv -lt 1 ] || "$1" -c "$py" 1>/dev/null 2>/dev/null || venv=0 + + # ideally, don't rely on PATH or hardcoded paths if python venv. + # use the *real*, direct executable linked to by the venv symlink + if [ $venv -gt 0 ] && [ -L "`command -v "$1" 2>/dev/null`" ]; then + # realpath isn't posix, but available mostly universally + pypath="$(realpath \ + "$(command -v "$1" 2>/dev/null)" 2>/dev/null || :)" + [ -e "$pypath" ] && [ ! -d "$pypath" ] && \ + [ -x "$pypath" ] && printf "%s\n" "$pypath" && return 0; : + fi + + # if python venv: fall back to common PATH directories for checking + [ $venv -gt 0 ] && for pypath in "/usr/local/bin" "/usr/bin"; do + [ -e "$pypath/$1" ] && [ ! -d "$pypath/$1" ] && \ + [ -x "$pypath/$1" ] && printf "%s/%s\n" "$pypath" "$1" && \ + return 0 + done + [ $venv -gt 0 ] && return 1 + + # Defer to normal command -v if not a venv + command -v "$1" 2>/dev/null || return 1 +} + +xbmk_set_env() +{ + # XBMK_CACHE is a directory, for caching downloads and git repon + [ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$xbmkpwd/cache" + [ -z "$XBMK_CACHE" ] && export XBMK_CACHE="$xbmkpwd/cache" + [ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "$xbmkpwd/cache" ] && \ + $err "cachedir '$xbmkpwd/cache' is a symlink" + [ -L "$XBMK_CACHE" ] && export XBMK_CACHE="$xbmkpwd/cache" + [ -f "$XBMK_CACHE" ] && $err "cachedir '$XBMK_CACHE' is a file"; : + + # 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" + + [ -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; : +} + +xbmk_set_version() +{ + for fv in version versiondate; do + eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" + 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"; : + + 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_" + + chkvars version versiondate + printf "%s\n" "$version" > .version || $err "can't save version" + printf "%s\n" "$versiondate" > .versiondate || $err "can't save date" + + relname="$projectname-$version" + export LOCALVERSION="-$projectname-${version%%-*}" +} + +xbmk_git_init() +{ + [ -L ".git" ] && return 1 + [ -e ".git" ] && return 0 + eval "`setvars "$(date -Rud @$versiondate)" cdate _nogit`" + + x_ git init 1>/dev/null 2>/dev/null + x_ git add -A . 1>/dev/null 2>/dev/null + x_ git commit -m "$projectname $version" --date "$cdate" \ + --author="xbmk <xbmk@example.com>" 1>/dev/null 2>/dev/null + x_ git tag -a "$version" -m "$projectname $version" 1>/dev/null \ + 2>/dev/null + + for gitarg in "--global user.name" "--global user.email"; do + gitcmd="git config $gitarg"; $gitcmd || $err \ + "Please run this first: $gitcmd \"your ${gitcmd##*.}\"" + done +} + +xbmk_create_tmpdir() +{ + # unify all temporary files/directories in a single TMPDIR + [ -z "${TMPDIR+x}" ] || [ "${TMPDIR%_*}" = "/tmp/xbmk" ] || \ + unset TMPDIR + [ -n "${TMPDIR+x}" ] && export TMPDIR="$TMPDIR" && xbmktmp="$TMPDIR" + [ -z "${TMPDIR+x}" ] || return 1 # child instance, so return + + # parent instance of xbmk, so don't return. set up TMPDIR + export TMPDIR="/tmp" + export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)" + xbmktmp="$TMPDIR" +} + +xbmk_lock() +{ + [ -f "lock" ] && $err "$xbmkpwd/lock exists. Is a build running?" + touch lock || $err "cannot create 'lock' file"; : +} + +xbmk_create_pathdirs() +{ + 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" + x_ ln -s "`pybin "$python"`" python + ) || $err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"; : +} + +xbmk_child_exec() +{ + xbmk_rval=0 + ( x_ ./mk "$@" ) || xbmk_rval=1 + rm -Rf "$xbmktmp" || xbmk_rval=1 + rm -f lock || xbmk_rval=1 + exit $xbmk_rval +} + +x_() +{ + [ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; : +} + +xbmk_init "$@" diff --git a/include/vendor.sh b/include/inject.sh index 4ee593ea..6b316729 100644 --- a/include/vendor.sh +++ b/include/inject.sh @@ -16,6 +16,7 @@ vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" vguide="https://libreboot.org/docs/install/ivy_has_common.html" tmpromdel="$xbmkpwd/tmp/DO_NOT_FLASH" nvm="util/nvmutil/nvm" +ifdtool="elf/ifdtool/default/ifdtool" cvchk="CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW \ diff --git a/include/lib.sh b/include/lib.sh index f4e96c90..5e88fa54 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -4,217 +4,8 @@ # Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com> -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" - -_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" - -ifdtool="elf/ifdtool/default/ifdtool" cbfstool="elf/cbfstool/default/cbfstool" rmodtool="elf/cbfstool/default/rmodtool" -grubdata="config/data/grub" -err="err_" - -err_() -{ - printf "ERROR %s: %s\n" "$0" "$1" 1>&2 - exit 1 -} -x_() { - [ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; : -} - -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% }" -} -chkvars() -{ - for var in "$@"; do - eval "[ -n \"\${$var+x}\" ] || \$err \"$var unset\"" - eval "[ -n \"\$$var\" ] || \$err \"$var unset\"" - done; : -} - -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" -} - -e() -{ - es_t="e" && [ $# -gt 1 ] && es_t="$2" - es2="already exists" - estr="[ -$es_t \"\$1\" ] || return 1" - [ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="missing" - - eval "$estr" - printf "%s %s\n" "$1" "$es2" 1>&2 -} - -install_packages() -{ - [ $# -lt 2 ] && $err "fewer than two arguments" - [ $# -gt 2 ] && reinstall="$3" - - eval "`setcfg "config/dependencies/$2"`" - - chkvars pkg_add pkglist - $pkg_add $pkglist || $err "Cannot 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 - -# Use direct path, to prevent a hang if Python is using a virtual environment, -# not command -v, to prevent a hang when checking python's version -# See: https://docs.python.org/3/library/venv.html#how-venvs-work -pybin() -{ - py="import sys; quit(1) if sys.prefix == sys.base_prefix else quit(0)" - - venv=1 - command -v "$1" 1>/dev/null 2>/dev/null || venv=0 - [ $venv -lt 1 ] || "$1" -c "$py" 1>/dev/null 2>/dev/null || venv=0 - - # ideally, don't rely on PATH or hardcoded paths if python venv. - # use the *real*, direct executable linked to by the venv symlink - if [ $venv -gt 0 ] && [ -L "`command -v "$1" 2>/dev/null`" ]; then - # realpath isn't posix, but available mostly universally - pypath="$(realpath \ - "$(command -v "$1" 2>/dev/null)" 2>/dev/null || :)" - [ -e "$pypath" ] && [ ! -d "$pypath" ] && \ - [ -x "$pypath" ] && printf "%s\n" "$pypath" && return 0; : - fi - - # if python venv: fall back to common PATH directories for checking - [ $venv -gt 0 ] && for pypath in "/usr/local/bin" "/usr/bin"; do - [ -e "$pypath/$1" ] && [ ! -d "$pypath/$1" ] && \ - [ -x "$pypath/$1" ] && printf "%s/%s\n" "$pypath" "$1" && \ - return 0 - done - [ $venv -gt 0 ] && return 1 - - # Defer to normal command -v if not a venv - command -v "$1" 2>/dev/null || return 1 -} - -python="python3" -pybin python3 1>/dev/null || python="python" -pyver="2" && [ "$python" = "python3" ] && pyver="3" -pybin "$python" 1>/dev/null || pyver="" -[ -z "$pyver" ] || "`pybin "$python"`" -c \ - 'import sys; print(sys.version_info[:])' 1>/dev/null 2>/dev/null || \ - $err "Cannot detect host Python version." -if [ -n "$pyver" ]; then - pyver="$("$(pybin "$python")" -c \ - 'import sys; print(sys.version_info[:])' | awk '{print $1}')" - pyver="${pyver#(}" - pyver="${pyver%,}" -fi -[ "${pyver%%.*}" = "3" ] || $err "Wrong python version (must be v 3.x)" - -# 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" -[ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "$xbmkpwd/cache" ] && \ - $err "cachedir is default, $xbmkpwd/cache, but it exists and is a symlink" -[ -L "$XBMK_CACHE" ] && export XBMK_CACHE="$xbmkpwd/cache" -[ -f "$XBMK_CACHE" ] && $err "cachedir '$XBMK_CACHE' exists but it's a file" - -# unify all temporary files/directories in a single TMPDIR -[ -z "${TMPDIR+x}" ] || [ "${TMPDIR%_*}" = "/tmp/xbmk" ] || unset TMPDIR -[ -n "${TMPDIR+x}" ] && export TMPDIR="$TMPDIR" -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" - 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" - x_ ln -s "`pybin "$python"`" python - ) || $err "Can't set up python symlink in $XBMK_CACHE/xbmkpath" - - 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) -[ -z "${XBMK_RELEASE+x}" ] && export XBMK_RELEASE="n" -[ "$XBMK_RELEASE" = "y" ] || export XBMK_RELEASE="n" - -[ -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 - -[ -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)" || \ - 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 version versiondate; do - chkvars "$p" - eval "printf \"%s\\n\" \"\$$p\" > .$p || $err \"can't save $p\"" -done -relname="$projectname-$version" -export LOCALVERSION="-$projectname-${version%%-*}" - -check_defconfig() -{ - [ -d "$1" ] || $err "Target '$1' not defined." - for x in "$1"/config/*; do - [ -f "$x" ] && printf "%s\n" "$x" && return 1 - done; : -} remkdir() { @@ -254,23 +45,16 @@ rmgit() ) || $err "Cannot remove .git/.gitmodules in $1" } -# return 0 if project is single-tree, otherwise 1 -# e.g. coreboot is multi-tree, so 1 -singletree() -{ - for targetfile in "config/${1}/"*/target.cfg; do - [ -e "$targetfile" ] && [ -f "$targetfile" ] && return 1; : - done; : -} - # can grab from the internet, or copy locally. # if copying locally, it can only copy a file. xbmkget() { + _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" + _dlop="curl" && [ $# -gt 4 ] && _dlop="$5" 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" + bad_checksum "$4" "$cached" 2>/dev/null && dl_fail="y" [ "$dl_fail" = "n" ] && e "$3" f && return 0 x_ mkdir -p "${3%/*}" "$XBMK_CACHE/file" for url in "$1" "$2"; do @@ -292,28 +76,27 @@ xbmkget() else $err "$1 $2 $3 $4: Unsupported dlop type: '$_dlop'" fi - vendor_checksum "$4" "$cached" || dl_fail="n" + bad_checksum "$4" "$cached" || dl_fail="n" done [ "$dl_fail" = "y" ] && $err "$1 $2 $3 $4: not downloaded" [ "$cached" = "$3" ] || x_ cp "$cached" "$3"; : } -vendor_checksum() +bad_checksum() { [ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] || return 1 printf "Bad checksum for file: %s\n" "$2" 1>&2; rm -f "$2" || :; : } -cbfs() +e() { - ccmd="add-payload" && [ $# -gt 3 ] && [ $# -lt 5 ] && ccmd="add" - lzma="-c lzma" && [ $# -gt 3 ] && [ $# -lt 5 ] && lzma="-t $4" - - [ $# -gt 4 ] && [ "$5" = "0x1110000" ] && \ - ccmd="add-flat-binary" && \ - lzma="-c lzma -l 0x1110000 -e 0x1110000" + es_t="e" && [ $# -gt 1 ] && es_t="$2" + es2="already exists" + estr="[ -$es_t \"\$1\" ] || return 1" + [ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="missing" - x_ "$cbfstool" "$1" $ccmd -f "$2" -n "$3" $lzma + eval "$estr" + printf "%s %s\n" "$1" "$es2" 1>&2 } mk() @@ -323,3 +106,11 @@ mk() x_ ./mk $mk_flag $mk_arg done; : } + +check_defconfig() +{ + [ -d "$1" ] || $err "Target '$1' not defined." + for x in "$1"/config/*; do + [ -f "$x" ] && printf "%s\n" "$x" && return 1 + done; : +} diff --git a/include/rom.sh b/include/rom.sh index 710df853..68c61936 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -5,6 +5,8 @@ # Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com> # Copyright (c) 2023-2024 Riku Viitanen <riku.viitanen@protonmail.com> +grubdata="config/data/grub" + mkserprog() { [ $# -lt 1 ] && $err "mkserprog: no arguments provided" @@ -277,6 +279,18 @@ cprom() cbfs "$newrom" "config/data/grub/bootorder_uboot" bootorder raw; : } +cbfs() +{ + ccmd="add-payload" && [ $# -gt 3 ] && [ $# -lt 5 ] && ccmd="add" + lzma="-c lzma" && [ $# -gt 3 ] && [ $# -lt 5 ] && lzma="-t $4" + + [ $# -gt 4 ] && [ "$5" = "0x1110000" ] && \ + ccmd="add-flat-binary" && \ + lzma="-c lzma -l 0x1110000 -e 0x1110000" + + x_ "$cbfstool" "$1" $ccmd -f "$2" -n "$3" $lzma +} + mkcoreboottar() { [ "$target" = "$tree" ] && return 0 |