adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

compliance: Revert "scripts: handle auto defined ZEPHYR_<name>_MODULE"

Browse source 
With the requirement in #78316 for Zephyr modules to always define
ZEPHYR_<name>_MODULE Kconfig setting then there is no longer a need
for this commit. Simplify check_compliance by reverting ths commit.

This reverts commit 35e28e6315.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2024-09-18 10:29:05 +02:00 committed by Henrik Brix Andersen
parent 119b238594
commit fc741d5344
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/ci/check_compliance.py
View file

@ -387,6 +387,11 @@ class KconfigCheck(ComplianceTest):
This is needed to complete Kconfig sanity tests. This is needed to complete Kconfig sanity tests.
""" """
if self.no_modules:
with open(modules_file, 'w') as fp_module_file:
fp_module_file.write("# Empty\n")
return
# Invoke the script directly using the Python executable since this is # Invoke the script directly using the Python executable since this is
# not a module nor a pip-installed Python utility # not a module nor a pip-installed Python utility
zephyr_module_path = os.path.join(ZEPHYR_BASE, "scripts", zephyr_module_path = os.path.join(ZEPHYR_BASE, "scripts",
@ -414,18 +419,6 @@ class KconfigCheck(ComplianceTest):
)) ))
fp_module_file.write(content) fp_module_file.write(content)
if self.no_modules:
module_define_content = ""
module_definition = re.compile('config ZEPHYR_.*_MODULE.*').search
with open(modules_file, 'r+') as fp_module_file:
for line in fp_module_file:
if module_definition(line):
module_define_content += line
module_define_content += "\tbool\n"
fp_module_file.seek(0)
fp_module_file.write(module_define_content)
fp_module_file.truncate()
def get_module_setting_root(self, root, settings_file): def get_module_setting_root(self, root, settings_file):
""" """
Parse the Zephyr module generated settings file given by 'settings_file' Parse the Zephyr module generated settings file given by 'settings_file'