summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-09-05 07:16:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 06:42:28 (GMT)
commit285b9a0d8eb3c931287e1f3af5c03d8f83a418e4 (patch)
treec72b1418a1428111d77fff3f9f137d2d7a570081 /meta
parentcb4134f7982b339c85460efb40fa640db963988a (diff)
downloadpoky-285b9a0d8eb3c931287e1f3af5c03d8f83a418e4.tar.gz
oe/utils.py: Add vartrue()
It can be used to simplify code like: "${@['iffalse', 'iftrue'][var]}" (From OE-Core rev: fc5a5af7bc3619f575988a75efc0c4fe15478b2d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/lib/oe/utils.py8
2 files changed, 9 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index faef771..dbadeb3 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -610,7 +610,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types ${DEBUG_PREFIX_MAP}"
610# Disabled until the option works properly -feliminate-dwarf2-dups 610# Disabled until the option works properly -feliminate-dwarf2-dups
611FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" 611FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
612DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" 612DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
613SELECTED_OPTIMIZATION = "${@d.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD') == '1'])}" 613SELECTED_OPTIMIZATION = "${@d.getVar(oe.utils.vartrue('DEBUG_BUILD', 'DEBUG_OPTIMIZATION', 'FULL_OPTIMIZATION', d))}"
614SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" 614SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
615BUILD_OPTIMIZATION = "-O2 -pipe" 615BUILD_OPTIMIZATION = "-O2 -pipe"
616 616
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index fbda703..93b0763 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -25,6 +25,13 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d):
25 else: 25 else:
26 return falsevalue 26 return falsevalue
27 27
28def vartrue(var, iftrue, iffalse, d):
29 import oe.types
30 if oe.types.boolean(d.getVar(var)):
31 return iftrue
32 else:
33 return iffalse
34
28def less_or_equal(variable, checkvalue, truevalue, falsevalue, d): 35def less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
29 if float(d.getVar(variable)) <= float(checkvalue): 36 if float(d.getVar(variable)) <= float(checkvalue):
30 return truevalue 37 return truevalue
@@ -467,3 +474,4 @@ class ImageQAFailed(bb.build.FuncFailed):
467 msg = msg + ' (%s)' % self.description 474 msg = msg + ' (%s)' % self.description
468 475
469 return msg 476 return msg
477