Fix rebase

default.xml

@@ -11,27 +11,22 @@
   <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}"
 

meta-caros/conf/distro/caros.conf

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

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"

meta-caros/recipes-extended/images/caros-image.bb

@@ -1,11 +0,0 @@
-DESCRIPTION = "CaROS full image"
-
-IMAGE_FEATURES += "splash ssh-server-openssh"
-
-IMAGE_INSTALL = "\
-    packagegroup-core-boot \
-    packagegroup-core-full-cmdline \
-    ${CORE_IMAGE_EXTRA_INSTALL} \
-    "
-
-inherit core-image