diff options
author | Jacob Stiffler <j-stiffler@ti.com> | 2017-10-24 20:15:50 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2017-10-25 08:33:58 -0400 |
commit | 4c28ce3d8588c974a9379e14c0f3380c3bcb7478 (patch) | |
tree | 4842fa3cbd3600590b51384560c7db13ab199863 /classes/ti-pdk.bbclass | |
parent | ac12e50b95a87a39639d6b732e5a136712af0330 (diff) | |
download | meta-ti-4c28ce3d8588c974a9379e14c0f3380c3bcb7478.tar.gz |
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>
Diffstat (limited to 'classes/ti-pdk.bbclass')
-rw-r--r-- | classes/ti-pdk.bbclass | 26 |
1 files 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 ?= "" | |||
63 | TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}" | 63 | TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}" |
64 | 64 | ||
65 | PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}" | 65 | PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}" |
66 | PARALLEL_MAKE = "" | ||
67 | |||
68 | EXTRA_OEMAKE = " \ | ||
69 | LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \ | ||
70 | LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \ | ||
71 | LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \ | ||
72 | ${TI_PDK_EXTRA_MAKE} \ | ||
73 | " | ||
66 | 74 | ||
67 | do_configure() { | 75 | do_configure() { |
68 | BUILD_DIR=${B}/`get_build_dir_bash` | 76 | BUILD_DIR=${B}/`get_build_dir_bash` |
@@ -79,25 +87,31 @@ do_configure() { | |||
79 | find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \; | 87 | find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \; |
80 | find -name "*.xs" -exec sed -i "/\.chm/d" {} \; | 88 | find -name "*.xs" -exec sed -i "/\.chm/d" {} \; |
81 | find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \; | 89 | find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \; |
90 | |||
91 | cd ${B} | ||
92 | ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR . | ||
93 | else | ||
94 | if [ "${CLEANBROKEN}" != "1" ] | ||
95 | then | ||
96 | cd ${BUILD_DIR} | ||
97 | oe_runmake clean | ||
98 | cd "${B}" | ||
99 | fi | ||
82 | fi | 100 | fi |
101 | |||
83 | } | 102 | } |
84 | 103 | ||
85 | do_compile() { | 104 | do_compile() { |
86 | 105 | ||
87 | if [ "${TI_PDK_XDCMAKE}" == "1" ] | 106 | if [ "${TI_PDK_XDCMAKE}" == "1" ] |
88 | then | 107 | then |
89 | ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR . | ||
90 | ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${TI_PDK_XDC_ARGS}" ROOTDIR="${ROOTDIR}" -PR . | 108 | ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${TI_PDK_XDC_ARGS}" ROOTDIR="${ROOTDIR}" -PR . |
91 | ${XDC_INSTALL_DIR}/xdc release XDCARGS="${TI_PDK_XDC_ARGS}" -PR . | 109 | ${XDC_INSTALL_DIR}/xdc release XDCARGS="${TI_PDK_XDC_ARGS}" -PR . |
92 | else | 110 | else |
93 | BUILD_DIR=${B}/`get_build_dir_bash` | 111 | BUILD_DIR=${B}/`get_build_dir_bash` |
94 | cd ${BUILD_DIR} | 112 | cd ${BUILD_DIR} |
95 | 113 | ||
96 | make ${TI_PDK_MAKE_TARGET} \ | 114 | oe_runmake ${TI_PDK_MAKE_TARGET} |
97 | LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \ | ||
98 | LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \ | ||
99 | LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \ | ||
100 | ${TI_PDK_EXTRA_MAKE} | ||
101 | fi | 115 | fi |
102 | } | 116 | } |
103 | 117 | ||