From 3b280e92f3f0069fc854bb1847ad00176d78cfa9 Mon Sep 17 00:00:00 2001 From: Tatiana Leon Date: Tue, 27 Feb 2018 10:47:46 +0100 Subject: [PATCH] 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 (cherry picked from commit 379ca469dff949e09c667d1a448012881b8812d2) Signed-off-by: Gonzalo Ruiz --- sdk/build.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sdk/build.sh b/sdk/build.sh index d0a5178f1..8bb7f3420 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -205,11 +205,7 @@ if pushd ${YOCTO_INST_DIR}; then error "Revision \"${DY_REVISION}\" not found" fi fi - # If it is a manufacturing job, specify the manufacturing manifest name - 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} + yes "" 2>/dev/null | ${REPO} init --no-repo-verify -u ${MANIFEST_URL} ${repo_revision} ${REPO} forall -p -c 'git remote prune $(git remote)' time ${REPO} sync -d ${MAKE_JOBS} popd @@ -263,8 +259,8 @@ for platform in ${DY_PLATFORMS}; do if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then printf "%s\n" "${DY_EXTRA_LOCAL_CONF}" >> conf/local.conf fi - # Add the manufacturing layer to bblayers.conf file if it is a manufacturing job - if [ "${DY_MFG_IMAGE}" = "true" ]; then + # Check if it is a manufacturing job and, if the mfg layer is not there, add it + 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 fi for target in ${platform_targets}; do