summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-12-04 14:14:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:07 +0000
commit55db8777c2e66c9b96ecb74063ac4997d3471b6d (patch)
tree4f8f77c03bbe9934897099acbb74810ba41011a1
parentbdadf2fed8a195679bbe4f82182b98c12370c70d (diff)
downloadpoky-55db8777c2e66c9b96ecb74063ac4997d3471b6d.tar.gz
base.bbclass: fix CLEANBROKEN logic
The evalation order was incorrect in some situations (CLEANBROKEN=1 and GNUmakefile exists) the clean would be executed incorrectly. Add brackets to correct the logic. (From OE-Core rev: a9e95c3cd771b16bbf4c9eaa05c79d7b4ca7272a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f3185b420e..de81a7d687 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -226,7 +226,7 @@ base_do_configure() {
226 if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then 226 if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then
227 if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then 227 if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then
228 cd ${B} 228 cd ${B}
229 if [ "${CLEANBROKEN}" != "1" -a -e Makefile -o -e makefile -o -e GNUmakefile ]; then 229 if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then
230 ${MAKE} clean 230 ${MAKE} clean
231 fi 231 fi
232 find ${B} -name \*.la -delete 232 find ${B} -name \*.la -delete