Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues/openbmc env shell aliases #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issues/openbmc env shell aliases #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800fb13
Call unaliased 'ls' in openbmc-env.
ajenkins-privafy Aug 16, 2021
4cf5923
Use Python2/3 dict.items() method.
ajenkins-privafy Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openbmc-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is find(1) available? what about something like evb=$(find meta/evb-meta-evb-aspeed -type d -name 'meta*') - I guess they are looking for directories only anyway?


for temp_metaname in $platform_list; do
Expand Down
10 changes: 5 additions & 5 deletions update-features-macro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand All @@ -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")
Expand Down Expand Up @@ -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:
Expand Down