diff --git a/openbmc-env b/openbmc-env index 6ab369584e..e364818fb0 100644 --- a/openbmc-env +++ b/openbmc-env @@ -23,8 +23,8 @@ CURR_DIR=$(pwd) if [ -n "$TEMPLATECONF" ]; then platform_name=${TEMPLATECONF//\/conf/""} #echo "conf:$platform_name" - ami=$(ls -d meta-ami/meta-*) - evb=$(ls -d meta-evb/meta-evb-aspeed/meta*) + ami=$(\ls -d meta-ami/meta-*) + evb=$(\ls -d meta-evb/meta-evb-aspeed/meta*) platform_list="${ami}"$'\n'"${evb}" for temp_metaname in $platform_list; do diff --git a/update-features-macro.py b/update-features-macro.py index 2008816059..59a5fd60e7 100755 --- a/update-features-macro.py +++ b/update-features-macro.py @@ -117,8 +117,8 @@ def get_features_configs(configs): if 'spx_macro' in feature.keys(): # print('dict Feature:',feature['spx_macro'],feature['enable']) f[feature['spx_macro']] = feature['enable'] - elif 'macro' in feature.keys(): - f[feature['macro']] = feature['enable'] + elif 'macro' in feature.keys(): + f[feature['macro']] = feature['enable'] else: print("Warning, ", feature['name']," this feature is not proper") if 'path' in feature.keys() and feature['path'] and feature['path'].endswith('.yaml'): @@ -133,7 +133,7 @@ def get_features_configs(configs): if 'spx_macro' in feature.keys(): # print('list Feature:', feature['spx_macro'], feature['enable']) f[feature['spx_macro']] = feature['enable'] - elif 'macro' in feature.keys(): + elif 'macro' in feature.keys(): f[feature['macro']] = feature['enable'] else: print("Warning, ", feature['name']," this feature is not proper") @@ -285,10 +285,10 @@ def update_core_features(ctnt, f, v): pdmk_ctnt = '' with open('projdef.cfg', 'r') as pdf: pdc_ctnt = pdf.read() -for f,v in features.iteritems(): +for f,v in features.items(): pdc_ctnt = update_prjdef_cfg(pdc_ctnt, f, v) -for c,v in configs.iteritems(): +for c,v in configs.items(): pdc_ctnt = update_prjdef_cfg(pdc_ctnt, c, v) with open('projdef.mod.cfg', 'w') as pdf: