ucentral: development update

* update ucentral-client
* update ucentral-schema
* rework CI file deployment
* fix firmware version reporting

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-05-06 07:52:56 +02:00
parent c596a66f26
commit e54a3d7db0
18 changed files with 36 additions and 13 deletions

View File

@@ -1,22 +1,22 @@
From 3eeb1949584e930fb4e3b9d5369c32e58ed40ab2 Mon Sep 17 00:00:00 2001
From 79dadbe5f9d74b3bca49e50a51f1a62be71b17a5 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 19 Jun 2020 10:45:22 +0200
Subject: [PATCH 03/21] pending: scripts: add gen_config.py
Subject: [PATCH 01/31] pending: scripts: add gen_config.py
This script is used to setup the tree based on the profiles/.
Signed-off-by: John Crispin <john@phrozen.org>
---
scripts/gen_config.py | 188 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 188 insertions(+)
scripts/gen_config.py | 193 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 193 insertions(+)
create mode 100755 scripts/gen_config.py
diff --git a/scripts/gen_config.py b/scripts/gen_config.py
new file mode 100755
index 0000000000..5bc7068ae7
index 0000000000..124dfd596a
--- /dev/null
+++ b/scripts/gen_config.py
@@ -0,0 +1,188 @@
@@ -0,0 +1,193 @@
+#!/usr/bin/env python3
+
+from os import getenv
@@ -63,7 +63,7 @@ index 0000000000..5bc7068ae7
+
+ new = yaml.safe_load(profile_file.read_text())
+ for n in new:
+ if n in {"profile", "target", "subtarget", "external_target"}:
+ if n in {"profile", "target", "subtarget", "external_target", "image"}:
+ if profile.get(n):
+ die(f"Duplicate tag found {n}")
+ profile.update({n: new.get(n)})
@@ -115,7 +115,7 @@ index 0000000000..5bc7068ae7
+ for p in profile.get("feeds", []):
+ try:
+ f = profile["feeds"].get(p)
+ if all(k in f for k in ("branch", "revision", "path")):
+ if all(k in f for k in ("branch", "revision", "path", "tag")):
+ die(f"Please specify either a branch, a revision or a path: {f}")
+ if "path" in f:
+ feeds.append(
@@ -125,6 +125,10 @@ index 0000000000..5bc7068ae7
+ feeds.append(
+ f'{f.get("method", "src-git")},{f["name"]},{f["uri"]}^{f.get("revision")}'
+ )
+ elif "tag" in f:
+ feeds.append(
+ f'{f.get("method", "src-git")},{f["name"]},{f["uri"]};{f.get("tag")}'
+ )
+ else:
+ feeds.append(
+ f'{f.get("method", "src-git")},{f["name"]},{f["uri"]};{f.get("branch", "master")}'
@@ -201,7 +205,8 @@ index 0000000000..5bc7068ae7
+ clean_tree()
+ setup_feeds(profile)
+ generate_config(profile)
+
+ if profile["image"]:
+ Path("image-file").write_text(profile["image"])
+ print("Running make defconfig")
+ if run(["make", "defconfig"]).returncode:
+ die(f"Error running make defconfig")