buildsystem: fix race case

Author: SalimTerryLi

Makefile

@@ -57,19 +57,22 @@ validate:	$(ALL_BOARDS_VALIDATION) \
 			$(ALL_DISTROS_VALIDATION)
 
 ALL_BOARDS_JSON := $(patsubst %.yml,%.json,$(addprefix $(OUTPUT_DIR)/,$(BOARDS)))
+# Always rebuild board level json, to satisfy imagesuite.parse
+.PHONY: $(ALL_BOARDS_JSON)
 $(ALL_BOARDS_JSON): $(OUTPUT_DIR)/%.json: %.yml
 	$(dir_guard)
 	./scripts/gen_board_json.py -i $^ -o $@
 .PHONY: per_board_info
 per_board_info: $(ALL_BOARDS_JSON)
 ALL_IMAGESUITE_PARSE := $(addsuffix .imagesuite.parse,$(IMAGESUITES))
 .PHONY: $(ALL_IMAGESUITE_PARSE)
-$(ALL_IMAGESUITE_PARSE): %.imagesuite.parse: % per_board_info
-	./scripts/parse_imagesuite.py -i $< -j $(OUTPUT_DIR)
+$(ALL_IMAGESUITE_PARSE): %.imagesuite.parse : % per_board_info
+	./scripts/parse_imagesuite.py -i $* -j $(OUTPUT_DIR)
 .PHONY: per_imagesuite_info
 per_imagesuite_info: $(ALL_IMAGESUITE_PARSE)
+	rm -f $(addsuffix .lock,$(ALL_BOARDS_JSON))
 .PHONY: per_board_json
-per_board_json: validate per_board_info per_imagesuite_info
+per_board_json: per_board_info per_imagesuite_info
 .PHONY: per_board_json_clean
 per_board_json_clean:
 	rm -f $(ALL_BOARDS_JSON)
@@ -106,4 +109,4 @@ docs_cleanup:
 clean: json_cleanup resource_cleanup docs_cleanup
 
 .PHONY: all
-all: json resources docs
+all: json resources docs

README.md

@@ -76,6 +76,12 @@ source venv/bin/activate
 pip3 install -r requirements.txt
 ```
 
+校验 YAML：
+
+```shell
+make -j$(nproc) validate
+```
+
 生成 JSON：
 
 ```shell

requirements.txt

@@ -1,3 +1,4 @@
 wheel
 PyYAML>=6
 Cerberus>=1.3.7
+filelock>=3.17

scripts/parse_imagesuite.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import argparse
 import os.path
+from filelock import FileLock
 import yml_reftag
 import json
 
@@ -44,14 +45,16 @@ def main(args: argparse.Namespace):
     }
     distro_release['imagesuites'].append(img_json)
     for board_ref in img_yml[img_name]['compatible']:
-        with open(os.path.splitext(os.path.join(args.json_tree, board_ref.category, board_ref.resc))[0] + '.json', 'r') as fp:
-            board_json = json.load(fp)
-        if distro_name in board_json['os']:
-            board_json['os'][distro_name].append(distro_release)
-        else:
-            board_json['os'][distro_name] = [distro_release]
-        with open(os.path.splitext(os.path.join(args.json_tree, board_ref.category, board_ref.resc))[0] + '.json', 'w') as fp:
-            json.dump(board_json, fp, indent=2)
+        board_json_file = os.path.splitext(os.path.join(args.json_tree, board_ref.category, board_ref.resc))[0] + '.json'
+        with FileLock(board_json_file + ".lock", timeout=-1):
+            with open(board_json_file, 'r') as fp:
+                board_json = json.load(fp)
+            if distro_name in board_json['os']:
+                board_json['os'][distro_name].append(distro_release)
+            else:
+                board_json['os'][distro_name] = [distro_release]
+            with open(board_json_file, 'w') as fp:
+                json.dump(board_json, fp, indent=2)
 
 if __name__ == "__main__":
     arg_parser = argparse.ArgumentParser()
@@ -67,4 +70,4 @@ def main(args: argparse.Namespace):
                             help="Search path for YAMLs being referenced",
                             required=False, type=str, default=''
                             )
-    main(arg_parser.parse_args())
+    main(arg_parser.parse_args())