diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-02 13:50:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:39:00 +0000 |
commit | 6ab50017e18cbb5eeeee2df9075fdfa54d05489f (patch) | |
tree | c19e07a3e7c63c881339bc625cdca5b6714cb295 /meta/recipes-core | |
parent | e8860f77a2099d41cab3bdd290c801596bcfbba4 (diff) | |
download | poky-6ab50017e18cbb5eeeee2df9075fdfa54d05489f.tar.gz |
busybox/gtk/perl/base-passwd: Ensure data is correctly expanded
Where variables are used in python, we need to ensure they are expanded.
This happens to work at the moment but likely will not happen in future
and isn't good code practise.
Its mostly an issue around key values, since bitbake has already
performed key expansion when these functions are executed.
(From OE-Core rev: 6d1142b56948c048111c4f78d9909c1846ab225b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index a770168298..10457b2dec 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | |||
@@ -89,7 +89,7 @@ if [ ! -e $D${sysconfdir}/group ]; then | |||
89 | """ + group + """EOF | 89 | """ + group + """EOF |
90 | fi | 90 | fi |
91 | """ | 91 | """ |
92 | d.setVar('pkg_preinst_${PN}', preinst) | 92 | d.setVar(d.expand('pkg_preinst_${PN}'), preinst) |
93 | } | 93 | } |
94 | 94 | ||
95 | addtask do_package after do_populate_sysroot | 95 | addtask do_package after do_populate_sysroot |
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index e5710f05f4..f74d1a4565 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -346,6 +346,8 @@ python do_package_prepend () { | |||
346 | dvar = d.getVar('D', True) | 346 | dvar = d.getVar('D', True) |
347 | pn = d.getVar('PN', True) | 347 | pn = d.getVar('PN', True) |
348 | def set_alternative_vars(links, target): | 348 | def set_alternative_vars(links, target): |
349 | links = d.expand(links) | ||
350 | target = d.expand(target) | ||
349 | f = open('%s%s' % (dvar, links), 'r') | 351 | f = open('%s%s' % (dvar, links), 'r') |
350 | for alt_link_name in f: | 352 | for alt_link_name in f: |
351 | alt_link_name = alt_link_name.strip() | 353 | alt_link_name = alt_link_name.strip() |