IMAGE_LINGUAS = " "
-inherit core-image
+AGL_BASE_IMAGE ?= "core-image"
-IMAGE_INSTALL = "${CORE_IMAGE_EXTRA_INSTALL}"
+inherit ${AGL_BASE_IMAGE}
-IMAGE_ROOTFS_SIZE ?= "8192"
+FEATURE_PACKAGES_selinux = " \
+ packagegroup-agl-core-selinux \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-core-selinux-devel', '', d)} \
+"
+
+IMAGE_FEATURES:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-# Allow extra IMAGE_FSTYPES to be added by boards configs
-IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}"
+IMAGE_INSTALL = "packagegroup-agl-core-boot ${CORE_IMAGE_EXTRA_INSTALL}"
+
+IMAGE_ROOTFS_SIZE ?= "8192"