@@ -6,11 +6,6 @@ COMPATIBLE_MACHINE = "ti-soc"
IMAGE_FEATURES += "package-management splash"
-# this is required to make sure the proper systemd default target gets set
-IMAGE_FEATURES += " \
- ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "weston", "", d)} \
-"
-
# 4KB per 1 inode should be enough
EXTRA_IMAGECMD:ext2.gz += "-i 4096"
@@ -7,6 +7,11 @@ require arago-image.inc
ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL ?= ""
+# we're assuming some display manager is being installed with opengl
+SYSTEMD_DEFAULT_TARGET = " \
+ ${@bb.utils.contains('DISTRO_FEATURES','opengl','graphical.target','multi-user.target',d)} \
+"
+
IMAGE_INSTALL += "\
packagegroup-arago-base \
packagegroup-arago-console \
@@ -8,6 +8,11 @@ require arago-image.inc
# Allow users to tack on additional packages as interesting.
ARAGO_THIN_IMAGE_EXTRA_INSTALL ?= ""
+# we're assuming some display manager is being installed with opengl
+SYSTEMD_DEFAULT_TARGET = " \
+ ${@bb.utils.contains('DISTRO_FEATURES','opengl','graphical.target','multi-user.target',d)} \
+"
+
IMAGE_INSTALL += "\
packagegroup-arago-base \
packagegroup-arago-console \
From: Randolph Sapp <rs@ti.com> Remove the IMAGE_FEATURES append line I was using to automatically configure some options from the core image we inherit. Instead explicitly set the systemd target based on the opengl distro feature and what image you are building for. This reverts commit f21a29344aebc86910b73d1adffe356113442506. --- meta-arago-distro/recipes-core/images/arago-image.inc | 5 ----- meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 5 +++++ .../recipes-core/images/tisdk-thinlinux-image.bb | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-)