diff --git a/ReadMe.md b/ReadMe.md index 04c5fe3..0c4206d 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -16,6 +16,7 @@ Default input while execution i.e. when user just presses enter without any inpu ## Release Compatibility |Device|AOT|SAL|APSN BSP|SDE|OS (Recommended)|Kernel| |---|---|---|---|---|---|---| +|BF2556X_1T
BF6064X_T|v1.4.2|sal_1.2.0|bf-reference-bsp-9.4.0-BF2556_1.0.0.zip
bf-reference-bsp-9.4.0-BF6064_1.0.0.zip|BF_SDE_9.4.0|Ubuntu Server 18.04.4 LTS|5.4.x |BF2556X_1T
BF6064X_T|v1.4.1|sal_1.1.1|bf-reference-bsp-9.3.0-BF2556_1c5723d.zip
bf-reference-bsp-9.3.0-BF6064_f536cae.zip|BF_SDE_9.3.0|Ubuntu Server 18.04.4 LTS|5.4.x |BF2556X_1T
BF6064X_T|v1.3.0|sal_1.1.0|bf-reference-bsp-9.2.0-BF2556_5189449.zip
bf-reference-bsp-9.2.0-BF6064_0ee36ac.zip|BF_SDE_9.2.0|Ubuntu Server 18.04.4 LTS|4.15.x |BF2556X_1T
BF6064X_T|v1.2.0|sal_1.1.0|BF2556X-1T_BSP_9.0.0(master HEAD)
BF6064X_BSP_9.0.0(master HEAD)|BF_SDE_9.1
BF_SDE_9.2|Ubuntu Server 18.04.4 LTS|4.15.x diff --git a/bf_sde.py b/bf_sde.py index 209f6b9..c1e85c5 100644 --- a/bf_sde.py +++ b/bf_sde.py @@ -26,7 +26,13 @@ def get_sde_build_flags(): def get_p4_studio_build_profile_name(): return get_from_setting_dict('BF SDE', 'p4studio_build_profile') + +def install_sde_deps(): + os.system('sudo apt -y install python') + + def build_sde(): + install_sde_deps() sde_tar = tarfile.open(get_sde_pkg_abs_path()) sde_home_absolute = get_sde_home_absolute() sde_build_flags = get_sde_build_flags() diff --git a/sal.py b/sal.py index b4d21bf..b53cb3d 100644 --- a/sal.py +++ b/sal.py @@ -181,7 +181,6 @@ def clean_sal(): def run_sal(): print('Starting SAL reference application...') - set_sal_runtime_env() if get_selected_profile_name() == constants.sal_hw_profile_name and not load_and_verify_kernel_modules(): print("ERROR:Some kernel modules are not loaded.") exit(0) @@ -383,18 +382,10 @@ def make_executable(path): def execute_user_action(sal_input): rc = True + if 'c' in sal_input: rc &= set_sal_env() rc &= clean_sal() - if 'r' in sal_input: - rc &= run_sal() - if 't' in sal_input: - print('Running SAL tests from AOT are currently not supported, ' - 'Should run from within SAL package only') - # rc &= test_sal() - if 'b' in sal_input: - rc &= set_sal_env() - rc &= build_sal() if 'i' in sal_input: if get_from_advance_setting_dict(constants.sal_sw_attr_node, constants.build_third_party_node): @@ -402,10 +393,19 @@ def execute_user_action(sal_input): else: print( 'But choose not to build thirdparty SW. Check settings.yaml') + if 'b' in sal_input: + rc &= set_sal_env() + rc &= build_sal() if 'p' in sal_input: rc &= set_sal_env() rc &= prepare_sal_release() - + if 'r' in sal_input: + set_sal_runtime_env() + rc &= run_sal() + if 't' in sal_input: + print('Running SAL tests from AOT are currently not supported, ' + 'Should run from within SAL package only') + # rc &= test_sal() return rc