Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build.sh: remove references to 'manufacturing.xml' file 

The file 'manufacturing.xml' file in the manifests repository does not exist.
When building manufacturing artifacts, we must use the 'manufacturing/morty'
branch, that already contains the right repositories to clone.

For a manufacturing job, this commit only adds the 'meta-digi-mfg' if it is not
already there.

Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>
(cherry picked from commit 379ca469dff949e09c667d1a448012881b8812d2)
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
This commit is contained in:
Tatiana Leon 2018-02-27 10:47:46 +01:00 committed by Gonzalo Ruiz
parent c76469fba7
commit 3b280e92f3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/build.sh
View File

@ -205,11 +205,7 @@ if pushd ${YOCTO_INST_DIR}; then
error "Revision \"${DY_REVISION}\" not found" error "Revision \"${DY_REVISION}\" not found"
fi fi
fi fi
# If it is a manufacturing job, specify the manufacturing manifest name yes "" 2>/dev/null | ${REPO} init --no-repo-verify -u ${MANIFEST_URL} ${repo_revision}
if [ "${DY_MFG_IMAGE}" = "true" ]; then
mfg_xml="-m manufacturing.xml"
fi
yes "" 2>/dev/null | ${REPO} init --no-repo-verify -u ${MANIFEST_URL} ${repo_revision} ${mfg_xml}
${REPO} forall -p -c 'git remote prune $(git remote)' ${REPO} forall -p -c 'git remote prune $(git remote)'
time ${REPO} sync -d ${MAKE_JOBS} time ${REPO} sync -d ${MAKE_JOBS}
popd popd
@ -263,8 +259,8 @@ for platform in ${DY_PLATFORMS}; do
if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then
printf "%s\n" "${DY_EXTRA_LOCAL_CONF}" >> conf/local.conf printf "%s\n" "${DY_EXTRA_LOCAL_CONF}" >> conf/local.conf
fi fi
# Add the manufacturing layer to bblayers.conf file if it is a manufacturing job # Check if it is a manufacturing job and, if the mfg layer is not there, add it
if [ "${DY_MFG_IMAGE}" = "true" ]; then if [ "${DY_MFG_IMAGE}" = "true" ] && ! grep -qs "meta-digi-mfg" conf/bblayers.conf; then
sed -i -e "/meta-digi-dey/a\ ${YOCTO_INST_DIR}/sources/meta-digi-mfg \\\\" conf/bblayers.conf sed -i -e "/meta-digi-dey/a\ ${YOCTO_INST_DIR}/sources/meta-digi-mfg \\\\" conf/bblayers.conf
fi fi
for target in ${platform_targets}; do for target in ${platform_targets}; do