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

mkproject.sh: fix sed command to set concurrency parameters 

With the update to Dora, the BB_NUMBER_THREADS and PARALLEL_MAKE entries
in the template config file changed slightly (added a '?'), but enough
so our mkproject script failed to match and configure them properly at
project creation time.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-02-27 18:53:12 +01:00
parent 77be150871
commit a0c2099ec4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/mkproject.sh
View File

@ -74,8 +74,8 @@ do_mkproject() {
NCPU="$(grep -c processor /proc/cpuinfo)" NCPU="$(grep -c processor /proc/cpuinfo)"
chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf
sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
sed -i -e "/^#BB_NUMBER_THREADS =/cBB_NUMBER_THREADS = \"${NCPU}\"" \ sed -i -e "/^#BB_NUMBER_THREADS ?=/cBB_NUMBER_THREADS ?= \"${NCPU}\"" \
-e "/^#PARALLEL_MAKE =/cPARALLEL_MAKE = \"-j ${NCPU}\"" \ -e "/^#PARALLEL_MAKE ?=/cPARALLEL_MAKE ?= \"-j ${NCPU}\"" \
${MKP_PROJECTPATH}/conf/local.conf ${MKP_PROJECTPATH}/conf/local.conf
if [ -n "${MKP_VARIANT+x}" ]; then if [ -n "${MKP_VARIANT+x}" ]; then
sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \ sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \