Merge branch 'ln/3-fix-yocto-bblayer-and-local-conf' into 'master'

#3 Fix misconfiguration of the yocto layer

See merge request caros/caros!1

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} \

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 \
 "
 

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"