mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-17 18:34:57 +02:00
set version/projectname properly
lbmk used to set version/versiondate directly in err.sh, but now it's handled there by a function, which is called by the main script. script/update/release hadn't yet been adapted. the only change necessary is to call check_project() script/update/trees also makes use of it script/build/roms is using "projectname" Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -45,7 +45,7 @@ main()
|
|||||||
initialise_command $@ && shift 1
|
initialise_command $@ && shift 1
|
||||||
|
|
||||||
check_git
|
check_git
|
||||||
check_project "fail"
|
check_project
|
||||||
git_init
|
git_init
|
||||||
|
|
||||||
execute_command $@
|
execute_command $@
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ check_project()
|
|||||||
x_ printf "%s\n" "${version}" > version
|
x_ printf "%s\n" "${version}" > version
|
||||||
xx_ printf "%s\n" "${versiondate}" > versiondate || \
|
xx_ printf "%s\n" "${versiondate}" > versiondate || \
|
||||||
x_ printf "%s\n" "${versiondate}" > versiondate
|
x_ printf "%s\n" "${versiondate}" > versiondate
|
||||||
|
|
||||||
|
export LOCALVERSION="-${projectname}-${version%%-*}"
|
||||||
}
|
}
|
||||||
|
|
||||||
setvars()
|
setvars()
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)"
|
|||||||
|
|
||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
|
check_project
|
||||||
|
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case ${1} in
|
case ${1} in
|
||||||
help)
|
help)
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ main()
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
check_project
|
||||||
|
|
||||||
vdir="${vdir}/${version}"
|
vdir="${vdir}/${version}"
|
||||||
relname="${projectname}-${version}"
|
relname="${projectname}-${version}"
|
||||||
src_dirname="${relname}_src"
|
src_dirname="${relname}_src"
|
||||||
|
|||||||
+2
-2
@@ -10,8 +10,6 @@ set -u -e
|
|||||||
. "include/option.sh"
|
. "include/option.sh"
|
||||||
. "include/git.sh"
|
. "include/git.sh"
|
||||||
|
|
||||||
export LOCALVERSION="-${projectname}-${version%%-*}"
|
|
||||||
|
|
||||||
eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \
|
eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \
|
||||||
elfdir listfile project target target_dir targets tree _f target1)"
|
elfdir listfile project target target_dir targets tree _f target1)"
|
||||||
|
|
||||||
@@ -36,6 +34,8 @@ main()
|
|||||||
[ -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"
|
||||||
|
|
||||||
|
check_project
|
||||||
|
|
||||||
_cmd="build_projects"
|
_cmd="build_projects"
|
||||||
[ -f "config/${project}/build.list" ] && _cmd="build_targets"
|
[ -f "config/${project}/build.list" ] && _cmd="build_targets"
|
||||||
$_cmd $@
|
$_cmd $@
|
||||||
|
|||||||
Reference in New Issue
Block a user