From a0c2099ec4146775f23cf92be6c16defde1486af Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 27 Feb 2014 18:53:12 +0100 Subject: [PATCH] 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 --- sdk/mkproject.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh index bfc057d42..284cbfbf6 100755 --- a/sdk/mkproject.sh +++ b/sdk/mkproject.sh @@ -74,8 +74,8 @@ do_mkproject() { NCPU="$(grep -c processor /proc/cpuinfo)" 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 "/^#BB_NUMBER_THREADS =/cBB_NUMBER_THREADS = \"${NCPU}\"" \ - -e "/^#PARALLEL_MAKE =/cPARALLEL_MAKE = \"-j ${NCPU}\"" \ + sed -i -e "/^#BB_NUMBER_THREADS ?=/cBB_NUMBER_THREADS ?= \"${NCPU}\"" \ + -e "/^#PARALLEL_MAKE ?=/cPARALLEL_MAKE ?= \"-j ${NCPU}\"" \ ${MKP_PROJECTPATH}/conf/local.conf if [ -n "${MKP_VARIANT+x}" ]; then sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \