From bee43bc3d4896603e4cb1839f5a4e8c30c771e5c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 27 Apr 2021 08:53:16 +0200 Subject: distro conf: require sota.conf.inc for atom, xeon Depends-on: I658c86f562743a50e5c078899e133e279b96027b Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e Signed-off-by: Alexandru Avadanii --- images/enea-nfv-access-common.inc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'images') 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;" IMAGE_FSTYPES += "ext4 ext4.gz tar.gz" -# Add ostree specific image types if sota support is set -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ota-ext4 wic', ' ', d)}" -SOTA_CLIENT = "" -SOTA_CLIENT_PROV = "" - -# Remove aktualizr from the image, we don't use it and creates odd dependencies, e.g. +# Remove aktualizr packages from the image, we don't use it and creates odd dependencies, e.g. # it creates a systemd unit that depends on network-online.target, which leads to enabling # NetworkManager-wait-online.service, delaying boot up. -IMAGE_INSTALL_remove = " \ +SOTA_CLIENT_PROV = "" +IMAGE_INSTALL_remove_sota = " \ aktualizr \ aktualizr-info \ " + +# We currently don't use automatic push/sign/check to a backend server, so skip running useless +# OSTree tasks during image build. +IMAGE_FSTYPES_remove_sota = " \ + ostreepush \ + garagesign \ + garagecheck \ + " -- cgit v1.2.3-54-g00ecf