[oe-commits] Ross Burton : base.bbclass: fix CLEANBROKEN logic
git at git.openembedded.org
git at git.openembedded.org
Fri Dec 5 18:01:36 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: a9e95c3cd771b16bbf4c9eaa05c79d7b4ca7272a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a9e95c3cd771b16bbf4c9eaa05c79d7b4ca7272a
Author: Ross Burton <ross.burton at intel.com>
Date: Thu Dec 4 14:14:57 2014 +0000
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.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f3185b4..de81a7d 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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
More information about the Openembedded-commits
mailing list