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-core/systemd | |
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-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd_232.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index 3391c0118b..5b45eb221a 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb | |||
@@ -273,7 +273,7 @@ do_install_ptest () { | |||
273 | } | 273 | } |
274 | 274 | ||
275 | python populate_packages_prepend (){ | 275 | python populate_packages_prepend (){ |
276 | systemdlibdir = d.getVar("rootlibdir", True) | 276 | systemdlibdir = d.getVar("rootlibdir") |
277 | do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) | 277 | do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) |
278 | } | 278 | } |
279 | PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*" | 279 | PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*" |
@@ -591,6 +591,6 @@ python () { | |||
591 | raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") | 591 | raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") |
592 | 592 | ||
593 | import re | 593 | import re |
594 | if re.match('.*musl*', d.getVar('TARGET_OS', True)) != None: | 594 | if re.match('.*musl*', d.getVar('TARGET_OS')) != None: |
595 | raise bb.parse.SkipPackage("Not _yet_ supported on musl based targets") | 595 | raise bb.parse.SkipPackage("Not _yet_ supported on musl based targets") |
596 | } | 596 | } |