1 files changed, 18 insertions, 4 deletions

diff --git a/images/enea-edge-common.inc b/images/enea-edge-common.inc
index 5472056..b174064 100644
--- a/images/enea-edge-common.inc
+++ b/images/enea-edge-common.inc
@@ -10,6 +10,8 @@ IMAGE_INSTALL += " \
 # run-postinsts duplicates dpkg-configure if package_deb is used
 PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}"
 
+PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras"
+
 # After installing packages inside the rootfs, remove backup DPKG status file
 rootfs_postinstall_dpkg_cleanup () {
     if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then
@@ -18,9 +20,21 @@ rootfs_postinstall_dpkg_cleanup () {
 }
 ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;"
 
-IMAGE_FSTYPES = "ext4 ext4.gz tar.gz"
+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', 'otaimg wic', ' ', d)}"
-SOTA_CLIENT = ""
+# 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.
 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 \
+    "