diff options
| -rwxr-xr-x | build | 6 | ||||
| -rwxr-xr-x | include/option.sh | 47 | ||||
| -rwxr-xr-x | script/roms | 2 | ||||
| -rwxr-xr-x | script/trees | 1 |
4 files changed, 21 insertions, 35 deletions
@@ -29,7 +29,7 @@ main() [ "$1" = "dependencies" ] && x_ install_packages $@ && lbmk_exit 0 - for cmd in initcmd check_git check_project git_init excmd; do + for cmd in initcmd check_git git_init excmd; do eval "${cmd} \$@" done lbmk_exit 0 @@ -39,8 +39,6 @@ initcmd() { [ "$(id -u)" != "0" ] || $err "this command as root is not permitted" - check_project - case "${1}" in help) usage ${0} ;; list) items "script" ;; @@ -136,8 +134,6 @@ mkrelease() esac done - check_project - vdir="${vdir}/${version}" [ "${mode}" = "u-boot" ] && relname="u-boot-for-${relname}" src_dirname="${relname}_src" diff --git a/include/option.sh b/include/option.sh index 7303287d..986e0883 100755 --- a/include/option.sh +++ b/include/option.sh @@ -70,6 +70,26 @@ expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \ 1>/dev/null 2>/dev/null || threads=1 # user specified a non-integer export LBMK_THREADS="$threads" +x_() { + [ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0 +} + +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 +relname="${projectname}-${version}" +export LOCALVERSION="-${projectname}-${version%%-*}" + items() { rval=1 @@ -132,10 +152,6 @@ remkdir() 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 || \ @@ -152,29 +168,6 @@ git_err() $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 - - relname="${projectname}-${version}" - export LOCALVERSION="-${projectname}-${version%%-*}" -} - mktar_release() { printf "%s\n" "${version}" > "${1}/version" || return 1 diff --git a/script/roms b/script/roms index 48eba1d5..6891d2f5 100755 --- a/script/roms +++ b/script/roms @@ -31,8 +31,6 @@ eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets \ main() { - check_project - while [ $# -gt 0 ]; do case ${1} in help) diff --git a/script/trees b/script/trees index 615fbbf2..3b126e56 100755 --- a/script/trees +++ b/script/trees @@ -37,7 +37,6 @@ main() cfgsdir="config/${project}" remkdir "${tmpgit%/*}" - check_project _cmd="build_projects" [ -f "config/${project}/build.list" ] && _cmd="build_targets" |