Compare commits
12 Commits
1af2c08e12
...
ff36527dac
| Author | SHA1 | Date | |
|---|---|---|---|
|
ff36527dac
|
|||
|
a8338357c0
|
|||
|
fabc4a5009
|
|||
|
6bf7b2fd2b
|
|||
|
baf1f98e69
|
|||
|
4bcc914087
|
|||
| a2fcac7b4b | |||
|
4254190a14
|
|||
|
50a2e25a9b
|
|||
|
c96db27895
|
|||
|
93013a925a
|
|||
|
e65e90cba5
|
@@ -5,9 +5,8 @@ set -o pipefail
|
|||||||
|
|
||||||
MANIFEST_BRANCH="${1:-main}"
|
MANIFEST_BRANCH="${1:-main}"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
YOCTO_GID="4040"
|
||||||
YOCTO_GID="$((1 + $RANDOM % 1000))"
|
YOCTO_UID="2000"
|
||||||
YOCTO_UID="$((1 + $RANDOM % 1000))"
|
|
||||||
YOCTO_USER="yocto"
|
YOCTO_USER="yocto"
|
||||||
YOCTO_WORKDIR="/opt/${YOCTO_USER}"
|
YOCTO_WORKDIR="/opt/${YOCTO_USER}"
|
||||||
|
|
||||||
@@ -56,11 +55,18 @@ if $DO_SSTATE ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if $DO_DEPLOY ; then
|
if $DO_DEPLOY ; then
|
||||||
|
<<<<<<< HEAD
|
||||||
DEPLOY_PATH="deploy"
|
DEPLOY_PATH="deploy"
|
||||||
mkdir -p $DEPLOY_PATH
|
mkdir -p $DEPLOY_PATH
|
||||||
rm -rf "$DEPLOY_PATH"/*
|
rm -rf "$DEPLOY_PATH"/*
|
||||||
deploy_param1="-v"
|
deploy_param1="-v"
|
||||||
deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
|
deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
|
||||||
|
=======
|
||||||
|
DEPLOY_PATH="deploy-rpms"
|
||||||
|
mkdir -p $DEPLOAY_PATH
|
||||||
|
deploy_param1="-v"
|
||||||
|
deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
|
||||||
|
>>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -82,9 +88,18 @@ 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 \
|
||||||
|
<<<<<<< HEAD
|
||||||
-v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \
|
-v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads: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} \
|
||||||
ghcr.io/jhnc-oss/yocto-image/yocto:37 \
|
ghcr.io/jhnc-oss/yocto-image/yocto:37 \
|
||||||
|
=======
|
||||||
|
-v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \
|
||||||
|
-v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \
|
||||||
|
--env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
|
||||||
|
--env SSTATE_PATH="${SSTATE_PATH}" \
|
||||||
|
${CONTAINER_NAME} \
|
||||||
|
ghcr.io/jhnc-oss/yocto-image/yocto:38 \
|
||||||
|
>>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss)
|
||||||
bash -c "dev/init_env.sh "
|
bash -c "dev/init_env.sh "
|
||||||
|
|||||||
Reference in New Issue
Block a user