diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/rootfs_deb.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs_deb.bbclass')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index f79fca608e..e8facd4368 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -14,7 +14,7 @@ do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | |||
14 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 14 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" |
15 | 15 | ||
16 | python rootfs_deb_bad_recommendations() { | 16 | python rootfs_deb_bad_recommendations() { |
17 | if d.getVar("BAD_RECOMMENDATIONS", True): | 17 | if d.getVar("BAD_RECOMMENDATIONS"): |
18 | bb.warn("Debian package install does not support BAD_RECOMMENDATIONS") | 18 | bb.warn("Debian package install does not support BAD_RECOMMENDATIONS") |
19 | } | 19 | } |
20 | do_rootfs[prefuncs] += "rootfs_deb_bad_recommendations" | 20 | do_rootfs[prefuncs] += "rootfs_deb_bad_recommendations" |
@@ -25,7 +25,7 @@ opkglibdir = "${localstatedir}/lib/opkg" | |||
25 | 25 | ||
26 | python () { | 26 | python () { |
27 | # Map TARGET_ARCH to Debian's ideas about architectures | 27 | # Map TARGET_ARCH to Debian's ideas about architectures |
28 | darch = d.getVar('SDK_ARCH', True) | 28 | darch = d.getVar('SDK_ARCH') |
29 | if darch in ["x86", "i486", "i586", "i686", "pentium"]: | 29 | if darch in ["x86", "i486", "i586", "i686", "pentium"]: |
30 | d.setVar('DEB_SDK_ARCH', 'i386') | 30 | d.setVar('DEB_SDK_ARCH', 'i386') |
31 | elif darch == "x86_64": | 31 | elif darch == "x86_64": |