From 7590de0311461a29dcdb73486c5394ce5ebe782a Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Fri, 1 Sep 2023 17:25:00 +0200 Subject: [PATCH] add distro features and disable busybox --- meta-caros/conf/distro/caros.conf | 2 +- meta-caros/conf/distro/include/preferred-versions.conf | 9 +++++++++ meta-caros/recipes-core/images/caros-image-minimal.bb | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta-caros/conf/distro/caros.conf b/meta-caros/conf/distro/caros.conf index 1761061..42047e7 100644 --- a/meta-caros/conf/distro/caros.conf +++ b/meta-caros/conf/distro/caros.conf @@ -15,4 +15,4 @@ MAINTAINER = "Lars Niesen " TARGET_VENDOR = "-caros" -DISTRO_FEATURES ?= "" +DISTRO_FEATURES += "wayland systemd usbgadget usbhost" diff --git a/meta-caros/conf/distro/include/preferred-versions.conf b/meta-caros/conf/distro/include/preferred-versions.conf index f8668af..70eaf97 100644 --- a/meta-caros/conf/distro/include/preferred-versions.conf +++ b/meta-caros/conf/distro/include/preferred-versions.conf @@ -3,3 +3,12 @@ ######################### PREFERRED_VERSION_linux-yocto ?= "5.15%" PREFERRED_VERSION_linux-yocto-rt ?= "5.15%" + +VIRTUAL-RUNTIME_init_manager = "systemd" +VIRTUAL-RUNTIME_dev_manager = "udev" +VIRTUAL-RUNTIME_base-utils = "coreutils" +VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock" +VIRTUAL-RUNTIME_base-utils-syslog = "util-linux-syslog" +VIRTUAL-RUNTIME_login_manager = "shadow-base" +VIRTUAL-RUNTIME_initscripts = "" + diff --git a/meta-caros/recipes-core/images/caros-image-minimal.bb b/meta-caros/recipes-core/images/caros-image-minimal.bb index adf5c36..e03b36e 100644 --- a/meta-caros/recipes-core/images/caros-image-minimal.bb +++ b/meta-caros/recipes-core/images/caros-image-minimal.bb @@ -1,9 +1,10 @@ SUMMARY = "Minimal bootable image for CaROS develoment" +IMAGE_FEATURES = "nfs-server ssh-server-openssh" +# packagegroup-core-boot expandent to remove busybox +# PACKAGES_CORE_BOOT = IMAGE_INSTALL = "packagegroup-core-boot" inherit core-image LICENSE = "MIT" - -IMAGE_ROOTFS_SIZE ?= "8192"