CaROS/caros
3
2
Fork 0
Code Issues Pull Requests 1 Packages Projects 1 Releases Wiki Activity

Fix depoly path variable in mkdir

Browse Source
This commit is contained in:
Lars Niesen
2023-07-20 12:24:51 +02:00
parent 93013a925a
commit 52ef614e2f
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -1,3 +1,3 @@
./sstate deploy_rpms
./sstate-cache sstate-cache
./download downloads

12
dev/bootstrap.sh
View File

@@ -10,10 +10,10 @@ YOCTO_UID="2000"
YOCTO_USER="yocto" YOCTO_USER="yocto"
YOCTO_WORKDIR="/opt/${YOCTO_USER}" 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 [[ -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 )) subgidSize=$(( $(podman info --format "{{ range .Host.IDMappings.GIDMap }}+{{.Size }}{{end }}" ) - 1 ))
subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Size }}{{end }}" ) - 1 )) subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Size }}{{end }}" ) - 1 ))
@@ -57,9 +57,10 @@ fi
if $DO_DEPLOY ; then if $DO_DEPLOY ; then
DEPLOY_PATH="deploy_rpms" DEPLOY_PATH="deploy_rpms"
mkdir -p $DEPLOAY_PATH mkdir -p $DEPLOY_PATH
rm -rf "$DEPLOY_PATH"/*
deploy_param1="-v" deploy_param1="-v"
deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}" deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
fi fi
@@ -81,8 +82,7 @@ podman run \
-v "${PWD}"/default.xml:"${YOCTO_WORKDIR}"/default.xml \ -v "${PWD}"/default.xml:"${YOCTO_WORKDIR}"/default.xml \
-v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \ -v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \
-v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \ -v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \
-v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \ -v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \
-v "${PWD}"/sstate-cache:"${YOCTO_WORKDIR}"/sstate-cache:Z \
--env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \ --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
--env SSTATE_PATH="${SSTATE_PATH}" \ --env SSTATE_PATH="${SSTATE_PATH}" \
${CONTAINER_NAME} \ ${CONTAINER_NAME} \

6
meta-caros/conf/templates/local.conf.sample
View File

@@ -1,8 +1,8 @@
MACHINE ?= "genericx86-64" MACHINE ?= "genericx86-64"
DL_DIR ?= "${TOPDIR}/downloads" DL_DIR ?= "${TOPDIR}/../downloads"
SSTATE_DIR ?= "${TOPDIR}/sstate-cache" SSTATE_DIR ?= "${TOPDIR}/../sstate-cache"
DISTRO ?= "caros" DISTRO ?= "caros"
@@ -118,4 +118,4 @@ BB_DISKMON_DIRS ??= "\
# this doesn't mean anything to you. # this doesn't mean anything to you.
CONF_VERSION = "2" CONF_VERSION = "2"
DEPLOY_DIR_RPM = "${TOPDIR}../deploy_rpms" DEPLOY_DIR_RPM = "${TOPDIR}/../deploy_rpms"