Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-10 06:54:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fbt: moved FBT_NOEVN check to env setup script for *nix

Browse source
This commit is contained in:
hedger 2024-02-20 22:32:39 +00:00
parent d731918197
commit bc98c788fe
No known key found for this signature in database
GPG key ID: BC19012910E3C2CF
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fbt
View file

@ -12,15 +12,12 @@ SCONS_DEFAULT_FLAGS="--warn=target-not-built";
SCONS_EP="python3 -m SCons"; SCONS_EP="python3 -m SCons";
# public variables # public variables
FBT_NOENV="${FBT_NOENV:-""}";
FBT_NO_SYNC="${FBT_NO_SYNC:-""}"; FBT_NO_SYNC="${FBT_NO_SYNC:-""}";
FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}"; FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
FBT_VERBOSE="${FBT_VERBOSE:-""}"; FBT_VERBOSE="${FBT_VERBOSE:-""}";
FBT_GIT_SUBMODULE_SHALLOW="${FBT_GIT_SUBMODULE_SHALLOW:-""}"; FBT_GIT_SUBMODULE_SHALLOW="${FBT_GIT_SUBMODULE_SHALLOW:-""}";
if [ -z "$FBT_NOENV" ]; then FBT_VERBOSE="$FBT_VERBOSE" . "$SCRIPT_PATH/scripts/toolchain/fbtenv.sh";
FBT_VERBOSE="$FBT_VERBOSE" . "$SCRIPT_PATH/scripts/toolchain/fbtenv.sh";
fi
if [ -z "$FBT_VERBOSE" ]; then if [ -z "$FBT_VERBOSE" ]; then
SCONS_DEFAULT_FLAGS="$SCONS_DEFAULT_FLAGS -Q"; SCONS_DEFAULT_FLAGS="$SCONS_DEFAULT_FLAGS -Q";

11
scripts/toolchain/fbtenv.sh
View file

@ -76,6 +76,14 @@ fbtenv_restore_env()
unset FBT_TOOLCHAIN_PATH; unset FBT_TOOLCHAIN_PATH;
} }
fbtenv_check_if_noenv_set()
{
if [ -n "${FBT_NOENV:-""}" ]; then
return 1;
fi
return 0;
}
fbtenv_check_sourced() fbtenv_check_sourced()
{ {
if [ -n "${FBT_SKIP_CHECK_SOURCED:-""}" ]; then if [ -n "${FBT_SKIP_CHECK_SOURCED:-""}" ]; then
@ -298,6 +306,9 @@ fbtenv_print_config()
fbtenv_main() fbtenv_main()
{ {
if ! fbtenv_check_if_noenv_set; then
return 0;
fi
fbtenv_check_sourced || return 1; fbtenv_check_sourced || return 1;
fbtenv_get_kernel_type || return 1; fbtenv_get_kernel_type || return 1;
if [ "$1" = "--restore" ]; then if [ "$1" = "--restore" ]; then