luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile: Do not dump the environment during db-prepare 

The resources.yaml file does not exists at the beginning of the db-prepare calls
but the environment wants to read it which leads to the following error:

Preparing artix7 files
============================
Traceback (most recent call last):
  File ".../prjxray/utils/create_environment.py", line 62, in <module>
    main()
  File ".../prjxray/utils/create_environment.py", line 55, in main
    environment = get_environment_variables()
  File ".../prjxray/utils/create_environment.py", line 37, in get_environment_variables
    part_info = get_part_information(db_root, part)
  File ".../prjxray/prjxray/util.py", line 44, in get_part_information
    "Mapping file {} does not exists".format(filename)
AssertionError: Mapping file .../prjxray/database/artix7/mapping/parts.yaml does not exists

Do not dump the environment during this stage because the XRAY_PART is the only
neccessary information which is set in the <family>.sh script.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
This commit is contained in:
Daniel Schultz 2021-03-18 21:41:49 +01:00
parent 0cd104463e
commit f562d6acfd
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -144,8 +144,8 @@ db-prepare-$(1):
@echo "============================"
@mkdir -p database/$(1)/mapping
@cp settings/$(1)/devices.yaml database/$(1)/mapping/
@+source settings/$(1).sh && $(IN_ENV) ./utils/update_parts.py $(1)
@+source settings/$(1).sh && $(IN_ENV) ./utils/update_resources.py $(1)
@+SKIP_ENV=true source settings/$(1).sh && $(IN_ENV) ./utils/update_parts.py $(1)
@+SKIP_ENV=true source settings/$(1).sh && $(IN_ENV) ./utils/update_resources.py $(1)
db-$(1):
+source settings/$(1).sh && $$(MAKE) -C fuzzers

7
utils/create_environment.py
View File

@ -49,6 +49,13 @@ def get_environment_variables():
def main():
# Only dump the environment when the resource.yaml file for the family
# exists to prevent errors during the creation on the stdout.
# SKIP_ENV in the environment turns off the environment dump for updating
# all parts and resources, which will create the resource.yaml file.
if 'SKIP_ENV' in os.environ:
return
environment = get_environment_variables()
for key, value in environment.items():