michaelh/zephyr
1
0
Fork 0
Code Releases Activity

west: Fix defining modules without a module.yml

Browse source 
It is supported to have a zephyr module that does not have a
module.yml, but zephyr_module.py does not support it and will drop
such modules.

To fix this we add support in zephyr_module.py.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2019-12-19 15:49:22 +01:00 • committed by Anas Nashif
commit bb95dce98c
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/zephyr_module.py
View file

@ -79,6 +79,9 @@ def process_module(module):
module_path = PurePath(module) module_path = PurePath(module)
module_yml = module_path.joinpath('zephyr/module.yml') module_yml = module_path.joinpath('zephyr/module.yml')
# The input is a module if zephyr/module.yml is a valid yaml file
# or if both zephyr/CMakeLists.txt and zephyr/Kconfig are present.
if Path(module_yml).is_file(): if Path(module_yml).is_file():
with Path(module_yml).open('r') as f: with Path(module_yml).open('r') as f:
meta = yaml.safe_load(f.read()) meta = yaml.safe_load(f.read())
@ -92,6 +95,10 @@ def process_module(module):
return meta return meta
if Path(module_path.joinpath('zephyr/CMakeLists.txt')).is_file() and \
Path(module_path.joinpath('zephyr/Kconfig')).is_file():
return {'build': {'cmake': 'zephyr', 'kconfig': 'zephyr/Kconfig'}}
return None return None