RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: preserve profiles.json between builds 

Keep other profiles.json content if the data belongs to the current
build version.

Also useful for the ImageBuilder, which builds for a single model each
time. Without this commit the profiles.json would only contain the
latest build profile information.

Signed-off-by: Moritz Warning <moritzwarning@web.de>
[improve commit message]
Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Moritz Warning 2021-02-22 00:18:10 +01:00 committed by Paul Spooren
parent 3d026d2425
commit a463b96241
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/json_overview_image_info.py
View File

@ -18,19 +18,33 @@ work_dir = Path(getenv("WORK_DIR"))
output = {} output = {}
def get_initial_output(image_info):
# preserve existing profiles.json
if output_path.is_file():
profiles = json.loads(output_path.read_text())
if profiles["version_code"] == image_info["version_code"]:
return profiles
return image_info
for json_file in work_dir.glob("*.json"): for json_file in work_dir.glob("*.json"):
image_info = json.loads(json_file.read_text()) image_info = json.loads(json_file.read_text())
if not output: if not output:
output.update(image_info) output = get_initial_output(image_info)
else:
# get first (and only) profile in json file # get first and only profile in json file
device_id = next(iter(image_info["profiles"].keys())) device_id, profile = next(iter(image_info["profiles"].items()))
if device_id not in output["profiles"]: if device_id not in output["profiles"]:
output["profiles"].update(image_info["profiles"]) output["profiles"][device_id] = profile
else: else:
output["profiles"][device_id]["images"].append( output["profiles"][device_id]["images"].extend(profile["images"])
image_info["profiles"][device_id]["images"][0]
) # make image lists unique by name, keep last/latest
for device_id, profile in output["profiles"].items():
profile["images"] = list({e["name"]: e for e in profile["images"]}.values())
if output: if output:
default_packages, output["arch_packages"] = run( default_packages, output["arch_packages"] = run(