From 4c28ce3d8588c974a9379e14c0f3380c3bcb7478 Mon Sep 17 00:00:00 2001
From: Jacob Stiffler <j-stiffler@ti.com>
Date: Tue, 24 Oct 2017 20:15:50 +0000
Subject: [PATCH] ti-pdk: clean the sources during the configure task

* For the XDCMAKE recipes, a clean was already occuring udring the
  compile task.
* Move the clean to the configure task to more closely match the
  base.bbclass.
* As the non XDCMAKE recipes generate dep files, add a clean in
  configure for when dependencies have changed.
* Use oe_runmake to share options between "make release" and
  "make clean".
* There appears to be an issue with parallel builds using the
  ti-pdk-build framework, so unset PARALLEL_MAKE.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 classes/ti-pdk.bbclass | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/classes/ti-pdk.bbclass b/classes/ti-pdk.bbclass
index 76abfe41..f876802c 100644
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -63,6 +63,14 @@ TI_PDK_EXTRA_MAKE ?= ""
 TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}"
 
 PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"
+PARALLEL_MAKE = ""
+
+EXTRA_OEMAKE = " \
+    LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \
+    LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \
+    LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \
+    ${TI_PDK_EXTRA_MAKE} \
+"
 
 do_configure() {
     BUILD_DIR=${B}/`get_build_dir_bash`
@@ -79,25 +87,31 @@ do_configure() {
         find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
         find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
         find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
+
+        cd ${B}
+        ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
+    else
+        if [ "${CLEANBROKEN}" != "1" ]
+        then
+            cd ${BUILD_DIR}
+            oe_runmake clean
+            cd "${B}"
+        fi
     fi
+
 }
 
 do_compile() {
 
     if [ "${TI_PDK_XDCMAKE}" == "1" ]
     then
-        ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
         ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${TI_PDK_XDC_ARGS}" ROOTDIR="${ROOTDIR}" -PR .
         ${XDC_INSTALL_DIR}/xdc release XDCARGS="${TI_PDK_XDC_ARGS}" -PR .
     else
         BUILD_DIR=${B}/`get_build_dir_bash`
         cd ${BUILD_DIR}
 
-        make ${TI_PDK_MAKE_TARGET} \
-             LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \
-             LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \
-             LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \
-             ${TI_PDK_EXTRA_MAKE}
+        oe_runmake ${TI_PDK_MAKE_TARGET}
     fi
 }