From 50a2e25a9b773375261bd7707119bba557beca04 Mon Sep 17 00:00:00 2001
From: Lars Niesen <lars.niesen@gmx.de>
Date: Thu, 20 Jul 2023 12:24:51 +0200
Subject: [PATCH] Fix depoly path variable in mkdir

---
 .gitignore                                  |  6 +++---
 dev/bootstrap.sh                            | 12 ++++++------
 meta-caros/conf/templates/local.conf.sample |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9171cb3..8bd535d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-./sstate
-./sstate-cache
-./download
+deploy_rpms
+sstate-cache
+downloads
diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
index ea917d2..57f8bc4 100755
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -10,10 +10,10 @@ YOCTO_UID="2000"
 YOCTO_USER="yocto"
 YOCTO_WORKDIR="/opt/${YOCTO_USER}"
 
-[[ -d "$PWD"/download ]] || mkdir "$PWD"/download
+[[ -d "$PWD"/downloads ]] || mkdir "$PWD"/downloads
 [[ -d "$PWD"/sstate-cache ]] || mkdir "$PWD"/sstate-cache
 
-#sudo chmod -R 775 "${PWD}"/{download,sstate-cache}
+
 
 subgidSize=$(( $(podman info --format "{{ range .Host.IDMappings.GIDMap }}+{{.Size }}{{end }}" ) - 1 ))
 subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Size }}{{end }}" ) - 1 ))
@@ -57,9 +57,10 @@ fi
 
 if $DO_DEPLOY ; then
     DEPLOY_PATH="deploy_rpms"
-    mkdir -p $DEPLOAY_PATH
+    mkdir -p $DEPLOY_PATH
+    rm -rf "$DEPLOY_PATH"/*
     deploy_param1="-v"
-    deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
+    deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
 fi
 
 
@@ -81,8 +82,7 @@ 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 \
-  -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \
-  -v "${PWD}"/sstate-cache:"${YOCTO_WORKDIR}"/sstate-cache:Z \
+  -v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \
   --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
   --env SSTATE_PATH="${SSTATE_PATH}" \
   ${CONTAINER_NAME} \
diff --git a/meta-caros/conf/templates/local.conf.sample b/meta-caros/conf/templates/local.conf.sample
index c04867c..bf5931d 100644
--- a/meta-caros/conf/templates/local.conf.sample
+++ b/meta-caros/conf/templates/local.conf.sample
@@ -1,8 +1,8 @@
 MACHINE ?= "genericx86-64"
 
-DL_DIR ?= "${TOPDIR}/downloads"
+DL_DIR ?= "${TOPDIR}/../downloads"
 
-SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+SSTATE_DIR ?= "${TOPDIR}/../sstate-cache"
 
 DISTRO ?= "caros"
 
@@ -118,4 +118,4 @@ BB_DISKMON_DIRS ??= "\
 # this doesn't mean anything to you.
 CONF_VERSION = "2"
 
-DEPLOY_DIR_RPM = "${TOPDIR}../deploy_rpms"
+DEPLOY_DIR_RPM = "${TOPDIR}/../deploy_rpms"