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/recipes-support/attr/ea-acl.inc | |
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/recipes-support/attr/ea-acl.inc')
-rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 583ca1f84c..8750c3bc64 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc | |||
@@ -21,8 +21,8 @@ do_install_append_class-native () { | |||
21 | if test "${libdir}" = "${base_libdir}" ; then | 21 | if test "${libdir}" = "${base_libdir}" ; then |
22 | return | 22 | return |
23 | fi | 23 | fi |
24 | librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir', True))} | 24 | librelpath=${@os.path.relpath(d.getVar('libdir',True), d.getVar('base_libdir'))} |
25 | baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir', True))} | 25 | baselibrelpath=${@os.path.relpath(d.getVar('base_libdir',True), d.getVar('libdir'))} |
26 | 26 | ||
27 | # Remove bad symlinks & create the correct symlinks | 27 | # Remove bad symlinks & create the correct symlinks |
28 | if test -L ${D}${libdir}/lib${BPN}.so ; then | 28 | if test -L ${D}${libdir}/lib${BPN}.so ; then |
@@ -45,5 +45,5 @@ FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" | |||
45 | 45 | ||
46 | BBCLASSEXTEND = "native" | 46 | BBCLASSEXTEND = "native" |
47 | # Only append ldflags for target recipe and if USE_NLS is enabled | 47 | # Only append ldflags for target recipe and if USE_NLS is enabled |
48 | LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS', True) == 'yes')]}" | 48 | LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}" |
49 | EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS', True) == 'no')]}" | 49 | EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" |