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 11:02:15 +0100 |
commit | 0a4e75079aeb3bd24a750e7253681827c659424d (patch) | |
tree | 46549e0c44ac334c81781f40d055010f0e6b7311 /classes | |
parent | d61874d62d6c22d72d8d03857516f1d8e6cec789 (diff) | |
download | meta-updater-0a4e75079aeb3bd24a750e7253681827c659424d.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')
-rw-r--r-- | classes/image_repo_manifest.bbclass | 2 | ||||
-rw-r--r-- | classes/sota.bbclass | 4 |
2 files changed, 3 insertions, 3 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 @@ | |||
9 | # For more information, see: | 9 | # For more information, see: |
10 | # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests | 10 | # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests |
11 | 11 | ||
12 | HOSTTOOLS_NONFATAL += " repo " | 12 | HOSTTOOLS_NONFATAL += "repo python" |
13 | 13 | ||
14 | # Write build information to target filesystem | 14 | # Write build information to target filesystem |
15 | buildinfo_manifest () { | 15 | buildinfo_manifest () { |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 9009090..f6e904e 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)}" |
@@ -52,4 +52,4 @@ SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" | |||
52 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" | 52 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" |
53 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" | 53 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" |
54 | 54 | ||
55 | inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest | 55 | inherit sota_sanity sota_${SOTA_MACHINE} |