diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 15:00:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:51:19 +0000 |
commit | c8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch) | |
tree | 5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-qt/qt4/qt4_arch.inc | |
parent | 5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff) | |
download | poky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz |
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:
sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`
(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4_arch.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4_arch.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index e8c8fabe68..46d65a20d7 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc | |||
@@ -4,7 +4,7 @@ ARM_INSTRUCTION_SET = "arm" | |||
4 | 4 | ||
5 | def qt_arch(d): | 5 | def qt_arch(d): |
6 | import bb, re | 6 | import bb, re |
7 | arch = bb.data.getVar('TARGET_ARCH', d, 1) | 7 | arch = d.getVar('TARGET_ARCH', 1) |
8 | if re.match("^i.86$", arch): | 8 | if re.match("^i.86$", arch): |
9 | arch = "i386" | 9 | arch = "i386" |
10 | elif re.match("^arm.*", arch): | 10 | elif re.match("^arm.*", arch): |
@@ -17,9 +17,9 @@ def qt_arch(d): | |||
17 | 17 | ||
18 | def qt_endian(d): | 18 | def qt_endian(d): |
19 | import bb | 19 | import bb |
20 | if bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "le": | 20 | if d.getVar('SITEINFO_ENDIANNESS', True) == "le": |
21 | return "-little-endian" | 21 | return "-little-endian" |
22 | elif bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "be": | 22 | elif d.getVar('SITEINFO_ENDIANNESS', True) == "be": |
23 | return "-big-endian" | 23 | return "-big-endian" |
24 | else: | 24 | else: |
25 | assert False | 25 | assert False |