Compare commits
11 Commits
ff36527dac
...
1af2c08e12
| Author | SHA1 | Date | |
|---|---|---|---|
|
1af2c08e12
|
|||
|
9b17e9fadf
|
|||
|
b47e87e6cf
|
|||
|
02d97a0cd5
|
|||
|
139c702d3d
|
|||
|
a4442aa0d4
|
|||
|
cd1f5c9a33
|
|||
|
0d7f877771
|
|||
|
6978ded651
|
|||
|
99b4349973
|
|||
|
b6d3ef2da8
|
@@ -5,8 +5,9 @@ set -o pipefail
|
|||||||
|
|
||||||
MANIFEST_BRANCH="${1:-main}"
|
MANIFEST_BRANCH="${1:-main}"
|
||||||
|
|
||||||
YOCTO_GID="4040"
|
<<<<<<< HEAD
|
||||||
YOCTO_UID="2000"
|
YOCTO_GID="$((1 + $RANDOM % 1000))"
|
||||||
|
YOCTO_UID="$((1 + $RANDOM % 1000))"
|
||||||
YOCTO_USER="yocto"
|
YOCTO_USER="yocto"
|
||||||
YOCTO_WORKDIR="/opt/${YOCTO_USER}"
|
YOCTO_WORKDIR="/opt/${YOCTO_USER}"
|
||||||
|
|
||||||
@@ -55,18 +56,11 @@ 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
|
||||||
|
|
||||||
|
|
||||||
@@ -88,18 +82,9 @@ 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