From 99b4349973b3700dc60115cd08d6456b25bcb9f1 Mon Sep 17 00:00:00 2001
From: Lars Niesen <lars.niesen@gmx.de>
Date: Thu, 13 Jul 2023 00:22:13 +0200
Subject: [PATCH] #3 Fix misconfiguration of the yocto layer

---
 dev/bootstrap.sh                               | 4 ++--
 meta-caros/conf/templates/bblayers.conf.sample | 1 +
 meta-caros/conf/templates/local.conf.sample    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
index d5a4f1f..476b4a2 100755
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -56,7 +56,7 @@ if $DO_SSTATE ; then
 fi
 
 if $DO_DEPLOY ; then
-    DEPLOY_PATH="deploy-rpms"
+    DEPLOY_PATH="deploy_rpms"
     mkdir -p $DEPLOAY_PATH
     deploy_param1="-v"
     deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
@@ -82,7 +82,7 @@ podman run \
   -v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \
   -v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \
   -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \
-  -v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \
+  -v "${PWD}"/sstate-cache:"${YOCTO_WORKDIR}"/sstate-cache:Z \
   --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
   --env SSTATE_PATH="${SSTATE_PATH}" \
   ${CONTAINER_NAME} \
diff --git a/meta-caros/conf/templates/bblayers.conf.sample b/meta-caros/conf/templates/bblayers.conf.sample
index 9f1b450..ce20e80 100644
--- a/meta-caros/conf/templates/bblayers.conf.sample
+++ b/meta-caros/conf/templates/bblayers.conf.sample
@@ -21,5 +21,6 @@ BBLAYERS ?= " \
     ${TOPDIR}/../meta-oe/meta-python \
     ${TOPDIR}/../meta-oe/meta-webserver \
     ${TOPDIR}/../meta-oe/meta-xfce \
+    ${TOPDIR}/../meta-caros \
 "
 
diff --git a/meta-caros/conf/templates/local.conf.sample b/meta-caros/conf/templates/local.conf.sample
index 3f099ef..c04867c 100644
--- a/meta-caros/conf/templates/local.conf.sample
+++ b/meta-caros/conf/templates/local.conf.sample
@@ -118,3 +118,4 @@ BB_DISKMON_DIRS ??= "\
 # this doesn't mean anything to you.
 CONF_VERSION = "2"
 
+DEPLOY_DIR_RPM = "${TOPDIR}../deploy_rpms"