diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-04-27 08:53:16 +0200 |
---|---|---|
committer | Dan Andresan <Dan.Andresan@enea.com> | 2021-05-26 09:27:23 +0200 |
commit | bee43bc3d4896603e4cb1839f5a4e8c30c771e5c (patch) | |
tree | 5cafa293eec603da92d7682fd90fa8758c8209f3 /images | |
parent | 20e1f95b49cb2dfb321b770b260b0d82d49fe699 (diff) | |
download | meta-el-nfv-access-bee43bc3d4896603e4cb1839f5a4e8c30c771e5c.tar.gz |
distro conf: require sota.conf.inc for atom, xeon
Depends-on: I658c86f562743a50e5c078899e133e279b96027b
Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'images')
-rw-r--r-- | images/enea-nfv-access-common.inc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 2a7a8c6..b174064 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc | |||
@@ -22,15 +22,19 @@ ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" | |||
22 | 22 | ||
23 | IMAGE_FSTYPES += "ext4 ext4.gz tar.gz" | 23 | IMAGE_FSTYPES += "ext4 ext4.gz tar.gz" |
24 | 24 | ||
25 | # Add ostree specific image types if sota support is set | 25 | # Remove aktualizr packages from the image, we don't use it and creates odd dependencies, e.g. |
26 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ota-ext4 wic', ' ', d)}" | ||
27 | SOTA_CLIENT = "" | ||
28 | SOTA_CLIENT_PROV = "" | ||
29 | |||
30 | # Remove aktualizr from the image, we don't use it and creates odd dependencies, e.g. | ||
31 | # it creates a systemd unit that depends on network-online.target, which leads to enabling | 26 | # it creates a systemd unit that depends on network-online.target, which leads to enabling |
32 | # NetworkManager-wait-online.service, delaying boot up. | 27 | # NetworkManager-wait-online.service, delaying boot up. |
33 | IMAGE_INSTALL_remove = " \ | 28 | SOTA_CLIENT_PROV = "" |
29 | IMAGE_INSTALL_remove_sota = " \ | ||
34 | aktualizr \ | 30 | aktualizr \ |
35 | aktualizr-info \ | 31 | aktualizr-info \ |
36 | " | 32 | " |
33 | |||
34 | # We currently don't use automatic push/sign/check to a backend server, so skip running useless | ||
35 | # OSTree tasks during image build. | ||
36 | IMAGE_FSTYPES_remove_sota = " \ | ||
37 | ostreepush \ | ||
38 | garagesign \ | ||
39 | garagecheck \ | ||
40 | " | ||