Merge pull request #663 from advancedtelematic/feat/zeus/2020.1

Feat/zeus/2020.1

3 files changed, 7 insertions, 7 deletions

diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass
index c2e7056..0b311bd 100644
--- a/classes/image_repo_manifest.bbclass
+++ b/classes/image_repo_manifest.bbclass
@@ -9,7 +9,7 @@
 # For more information, see:
 # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests 
 
-HOSTTOOLS_NONFATAL += " repo "
+HOSTTOOLS_NONFATAL += "repo python"
 
 # Write build information to target filesystem
 buildinfo_manifest () {
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 4422741..7bf17a4 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -8,7 +8,7 @@ SOTA_DEPLOY_CREDENTIALS ?= "1"
 SOTA_HARDWARE_ID ??= "${MACHINE}"
 
 IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}"
-IMAGE_CLASSES += " image_types_ostree image_types_ota"
+IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest"
 
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}"
@@ -53,4 +53,4 @@ SOTA_MACHINE_freedom-u540 ?= "freedom-u540"
 SOTA_OVERRIDES_BLACKLIST = "ostree ota"
 SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME"
 
-inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest
+inherit sota_sanity sota_${SOTA_MACHINE}
diff --git a/classes/sota_sanity.bbclass b/classes/sota_sanity.bbclass
index 1339fb3..74973eb 100644
--- a/classes/sota_sanity.bbclass
+++ b/classes/sota_sanity.bbclass
@@ -14,10 +14,10 @@ def sota_check_variables_validity(status, d):
     import re
     import os.path
 
-    if d.getVar("OSTREE_BRANCHNAME") and re.match("^[a-zA-Z0-9_-]*$", d.getVar("OSTREE_BRANCHNAME")) is None:
-        status.addresult("OSTREE_BRANCHNAME Should only contain characters from the character set [a-zA-Z0-9_-].\n")
-    if d.getVar("SOTA_HARDWARE_ID") and re.match("^[a-zA-Z0-9_-]*$", d.getVar("SOTA_HARDWARE_ID")) is None:
-        status.addresult("SOTA_HARDWARE_ID Should only contain characters from the character set [a-zA-Z0-9_-].\n")
+    if d.getVar("OSTREE_BRANCHNAME") and re.match("^[a-zA-Z0-9._-]*$", d.getVar("OSTREE_BRANCHNAME")) is None:
+        status.addresult("OSTREE_BRANCHNAME Should only contain characters from the character set [a-zA-Z0-9._-].\n")
+    if d.getVar("SOTA_HARDWARE_ID") and re.match("^[a-zA-Z0-9._-]*$", d.getVar("SOTA_HARDWARE_ID")) is None:
+        status.addresult("SOTA_HARDWARE_ID Should only contain characters from the character set [a-zA-Z0-9._-].\n")
     if d.getVar("SOTA_CLIENT_FEATURES") is not None:
         for feat in d.getVar("SOTA_CLIENT_FEATURES").split(' '):
             if feat not in ("hsm", "serialcan", "ubootenv", ""):