diff options
author | Ming Liu <liu.ming50@gmail.com> | 2019-12-31 21:32:52 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2020-01-15 12:24:05 +0100 |
commit | 008e95a59b6aadbceccec35eb09a8f35a3cd62c9 (patch) | |
tree | 41ff811acb0b19b1ca9a60dc11ee894c470f43bd /classes/sota.bbclass | |
parent | 73d0471162a54c1737db6622781a3713a8bad61f (diff) | |
download | meta-updater-008e95a59b6aadbceccec35eb09a8f35a3cd62c9.tar.gz |
meta: add python to HOSTTOOLS_NONFATAL
repo is requiring python to be able to work correctly, add python to
HOSTTOOLS_NONFATAL as well.
image_repo_manifest is actually a image bbclass, move it to
IMAGE_CLASSES instead of inheriting it in sota.bbclass.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Diffstat (limited to 'classes/sota.bbclass')
-rw-r--r-- | classes/sota.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
8 | SOTA_HARDWARE_ID ??= "${MACHINE}" | 8 | SOTA_HARDWARE_ID ??= "${MACHINE}" |
9 | 9 | ||
10 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" | 10 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" |
11 | IMAGE_CLASSES += " image_types_ostree image_types_ota" | 11 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" |
12 | 12 | ||
13 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" | 13 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" |
14 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" | 14 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" |
@@ -53,4 +53,4 @@ SOTA_MACHINE_freedom-u540 ?= "freedom-u540" | |||
53 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" | 53 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" |
54 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" | 54 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" |
55 | 55 | ||
56 | inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest | 56 | inherit sota_sanity sota_${SOTA_MACHINE} |