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

build.sh: move downloads folder outside of the projects 

If we want to share the downloads folder between projects
we need to move it outside to don't remove it.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-01-09 18:44:45 +01:00
parent 28f07acf99
commit 6974e3fd93
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/build.sh
View File

@ -184,6 +184,7 @@ _EOF_
YOCTO_IMGS_DIR="${WORKSPACE}/images" YOCTO_IMGS_DIR="${WORKSPACE}/images"
YOCTO_INST_DIR="${WORKSPACE}/digi-yocto-sdk.$(echo ${DY_REVISION} | tr '/' '_')" YOCTO_INST_DIR="${WORKSPACE}/digi-yocto-sdk.$(echo ${DY_REVISION} | tr '/' '_')"
YOCTO_DOWNLOAD_DIR="${WORKSPACE}/downloads"
YOCTO_PROJ_DIR="${WORKSPACE}/projects" YOCTO_PROJ_DIR="${WORKSPACE}/projects"
CPUS="$(grep -c processor /proc/cpuinfo)" CPUS="$(grep -c processor /proc/cpuinfo)"
@ -212,8 +213,16 @@ if pushd ${YOCTO_INST_DIR}; then
popd popd
fi fi
# Create projects and build # Clean downloads directory
if [ "${DY_RM_DOWNLOADS}" = "true" ]; then
printf "\n[INFO] Removing the downloads folder.\n"
rm -rf ${YOCTO_DOWNLOAD_DIR}
fi
# Clean images and projects folders
rm -rf ${YOCTO_IMGS_DIR} ${YOCTO_PROJ_DIR} rm -rf ${YOCTO_IMGS_DIR} ${YOCTO_PROJ_DIR}
# Create projects and build
for platform in ${DY_PLATFORMS}; do for platform in ${DY_PLATFORMS}; do
# The variables <platform>_var|tgt got their dashes converted to # The variables <platform>_var|tgt got their dashes converted to
# underscores, so we must convert also the ones in ${platform}. # underscores, so we must convert also the ones in ${platform}.
@ -236,7 +245,7 @@ for platform in ${DY_PLATFORMS}; do
export TEMPLATECONF="${TEMPLATECONF:+${TEMPLATECONF}/${platform}}" export TEMPLATECONF="${TEMPLATECONF:+${TEMPLATECONF}/${platform}}"
MKP_PAGER="" . ${YOCTO_INST_DIR}/mkproject.sh -p ${platform} ${MACHINES_LAYER} ${_this_var_arg} <<< "y" MKP_PAGER="" . ${YOCTO_INST_DIR}/mkproject.sh -p ${platform} ${MACHINES_LAYER} ${_this_var_arg} <<< "y"
# Set a common DL_DIR and SSTATE_DIR for all platforms # Set a common DL_DIR and SSTATE_DIR for all platforms
sed -i -e "/^#DL_DIR ?=/cDL_DIR ?= \"${YOCTO_PROJ_DIR}/downloads\"" \ sed -i -e "/^#DL_DIR ?=/cDL_DIR ?= \"${YOCTO_DOWNLOAD_DIR}\"" \
-e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \ -e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \
conf/local.conf conf/local.conf
# Set the DISTRO and remove 'meta-digi-dey' layer if distro is not DEY based # Set the DISTRO and remove 'meta-digi-dey' layer if distro is not DEY based