]> code.ossystems Code Review - openembedded-core.git/commitdiff
base.bbclass: fix CLEANBROKEN logic
authorRoss Burton <ross.burton@intel.com>
Thu, 4 Dec 2014 14:14:57 +0000 (14:14 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 5 Dec 2014 17:43:14 +0000 (17:43 +0000)
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/base.bbclass

index f3185b420e3a28cacf11cad1c3dcd7c05a6aa28e..de81a7d68734e607594af69c8ece3a680f0b7c6c 100644 (file)
@@ -226,7 +226,7 @@ base_do_configure() {
        if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then
                if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then
                        cd ${B}
-                       if [ "${CLEANBROKEN}" != "1" -a -e Makefile -o -e makefile -o -e GNUmakefile ]; then
+                       if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then
                                ${MAKE} clean
                        fi
                        find ${B} -name \*.la -delete