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

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

Browse Source 
#3 Fix misconfiguration of the yocto layer

See merge request caros/caros!1
This commit is contained in:
Lars Niesen
2023-07-12 22:24:31 +00:00
parent e65e90cba5 93013a925a
commit ffd8406ec0
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev/bootstrap.sh
View File

@@ -56,7 +56,7 @@ if $DO_SSTATE ; then
fi fi
if $DO_DEPLOY ; then if $DO_DEPLOY ; then
DEPLOY_PATH="deploy-rpms" DEPLOY_PATH="deploy_rpms"
mkdir -p $DEPLOAY_PATH mkdir -p $DEPLOAY_PATH
deploy_param1="-v" deploy_param1="-v"
deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}" 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}"/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}"/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 TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
--env SSTATE_PATH="${SSTATE_PATH}" \ --env SSTATE_PATH="${SSTATE_PATH}" \
${CONTAINER_NAME} \ ${CONTAINER_NAME} \

1
meta-caros/conf/templates/bblayers.conf.sample
View File

@@ -21,5 +21,6 @@ BBLAYERS ?= " \
${TOPDIR}/../meta-oe/meta-python \ ${TOPDIR}/../meta-oe/meta-python \
${TOPDIR}/../meta-oe/meta-webserver \ ${TOPDIR}/../meta-oe/meta-webserver \
${TOPDIR}/../meta-oe/meta-xfce \ ${TOPDIR}/../meta-oe/meta-xfce \
${TOPDIR}/../meta-caros \
" "

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

@@ -118,3 +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"