add distro features and disable busybox

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 -   Lars Niesen, Emre Gülçino, Tilman Sattler, David Sattler
+Copyright (c) [year] [fullname]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

default.xml

@@ -5,33 +5,28 @@
   <default sync-j="4" />
 
   <!-- remotes -->
-  <remote name="caros" fetch="https://git.larsniesen.de/caros" />
+  <remote name="caros" fetch="https://git.larsniesen.de/CaROS" />
 
   <!-- layers -->
   <project remote="caros"
            name="poky"
            path="poky"
-           revision="5c556073ac6e54314aa3fc210db040f3ab55105a" />
+           revision="kirkstone" />
 
 
   <project remote="caros"
            name="meta-openembedded"
            path="meta-oe"
-           revision="a88cb922f91fda95e8a584cee3092083d5ad3e98" />
+           revision="kirkstone" />
 
   <project remote="caros"
            name="meta-qt6"
            path="meta-qt6"
-           revision="81a8947b8da3f0fbe03974d6b29e6205a76c3c42" />
+           revision="lts-6.2.9" />
 
   <project remote="caros"
            name="meta-selinux"
            path="meta-selinux"
-           revision="a401f4b2816a0b41ce8d9351542658c721935bcd" />
-
-  <project remote="caros"
-           name="meta-intel"
-           path="meta-intel"
-           revision="1342bcdc5bfc6620737e7d195e7d9bd744348577" />
+           revision="kirkstone" />
 </manifest>
 

dev/bootstrap.sh

@@ -5,8 +5,8 @@ set -o pipefail
 
 MANIFEST_BRANCH="${1:-main}"
 
-YOCTO_GID="1000"
-YOCTO_UID="1000"
+YOCTO_GID="4040"
+YOCTO_UID="2000"
 YOCTO_USER="yocto"
 YOCTO_WORKDIR="/opt/${YOCTO_USER}"
 
@@ -14,7 +14,6 @@ YOCTO_WORKDIR="/opt/${YOCTO_USER}"
 [[ -d "$PWD"/sstate-cache ]] || mkdir "$PWD"/sstate-cache
 
 
-
 subgidSize=$(( $(podman info --format "{{ range .Host.IDMappings.GIDMap }}+{{.Size }}{{end }}" ) - 1 ))
 subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Size }}{{end }}" ) - 1 ))
 
@@ -56,11 +55,18 @@ if $DO_SSTATE ; then
 fi
 
 if $DO_DEPLOY ; then
+<<<<<<< HEAD
     DEPLOY_PATH="deploy"
     mkdir -p $DEPLOY_PATH
     rm -rf "$DEPLOY_PATH"/*
     deploy_param1="-v"
     deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
+=======
+    DEPLOY_PATH="deploy-rpms"
+    mkdir -p $DEPLOAY_PATH
+    deploy_param1="-v"
+    deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
+>>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss)
 fi
 
 
@@ -82,9 +88,18 @@ podman run \
   -v "${PWD}"/default.xml:"${YOCTO_WORKDIR}"/default.xml \
   -v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \
   -v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \
+<<<<<<< HEAD
   -v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \
   --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
   --env SSTATE_PATH="${SSTATE_PATH}" \
   ${CONTAINER_NAME} \
   ghcr.io/jhnc-oss/yocto-image/yocto:37 \
+=======
+  -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \
+  -v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \
+  --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
+  --env SSTATE_PATH="${SSTATE_PATH}" \
+  ${CONTAINER_NAME} \
+  ghcr.io/jhnc-oss/yocto-image/yocto:38 \
+>>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss)
   bash -c "dev/init_env.sh "

meta-caros/conf/distro/caros.conf

@@ -15,4 +15,4 @@ MAINTAINER = "Lars Niesen <lars.niesen@gmx.de>"
 
 TARGET_VENDOR = "-caros"
 
-DISTRO_FEATURES ?= ""
+DISTRO_FEATURES += "wayland systemd usbgadget usbhost"

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 = ""
+

meta-caros/conf/templates/bblayers.conf.sample

@@ -21,7 +21,6 @@ BBLAYERS ?= " \
     ${TOPDIR}/../meta-oe/meta-python \
     ${TOPDIR}/../meta-oe/meta-webserver \
     ${TOPDIR}/../meta-oe/meta-xfce \
-    ${TOPDIR}/../meta-intel \
     ${TOPDIR}/../meta-caros \
 "
 

meta-caros/conf/templates/local.conf.sample

@@ -1,4 +1,4 @@
-MACHINE ?= "intel-corei7-64"
+MACHINE ?= "genericx86-64"
 
 DL_DIR ?= "${TOPDIR}/../downloads"
 

meta-caros/recipes-core/images/caros-image-minimal.bb

@@ -0,0 +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"