Replace includes with bblcasses

They are more flexible and allow tricks like conditionally inheriting
machine-related classes from the main one which makes things easier
for external users like AGL

3 files changed, 2 insertions, 27 deletions

diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 85744ea..e6f43f7 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -1,5 +1,4 @@
 require conf/distro/poky.conf
-require conf/distro/sota.conf.inc
 
 DISTRO = "poky-sota"
 DISTRO_NAME = "OTA-enabled Linux"
@@ -9,4 +8,5 @@ DISTRO_CODENAME = "sota"
 DISTRO_FEATURES_append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
+INHERIT += " sota"
 IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index 2bbc62b..6972a94 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -1,9 +1,9 @@
 require conf/distro/poky.conf
-require conf/distro/sota.conf.inc
 
 DISTRO = "poky-sota"
 DISTRO_NAME = "OTA-enabled Linux"
 DISTRO_VERSION = "1.0"
 DISTRO_CODENAME = "sota"
 
+INHERIT += " sota"
 IMAGE_INSTALL_append = " connman connman-client"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
deleted file mode 100644
index 20946a6..0000000
--- a/conf/distro/sota.conf.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-DISTRO_FEATURES_append = " sota"
-OVERRIDES .= ":sota"
-
-IMAGE_INSTALL_append = " ostree os-release"
-
-# live image for OSTree-enabled systems
-IMAGE_CLASSES += "image_types_ostree image_types_ota"
-IMAGE_FSTYPES += "ostreepush otaimg"
-
-# if don't build wic image unless IMAGE_BOOT_FILES is set. Prevents build from failing
-#   on machines that don't support updater yet
-IMAGE_FSTYPES += "${@' wic' if (d.getVar("IMAGE_BOOT_FILES", True)) else ''}"
-WKS_FILE ?= "sdimage-sota.wks"
-do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
-
-EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native"
-
-# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
-OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
-OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
-OSTREE_OSNAME ?= "poky"
-OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
-
-# Prelinking increases the size of downloads and causes build errors
-USER_CLASSES_remove = "image-prelink"