CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

busybox/gtk/perl/base-passwd: Ensure data is correctly expanded

Browse Source 
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>
This commit is contained in:
Richard Purdie 2016-02-02 13:50:47 +00:00
parent e8860f77a2
commit 6ab50017e1
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
View File

@ -89,7 +89,7 @@ if [ ! -e $D${sysconfdir}/group ]; then
""" + group + """EOF
fi
"""
d.setVar('pkg_preinst_${PN}', preinst)
d.setVar(d.expand('pkg_preinst_${PN}'), preinst)
}
addtask do_package after do_populate_sysroot

2
meta/recipes-core/busybox/busybox.inc
View File

@ -346,6 +346,8 @@ python do_package_prepend () {
dvar = d.getVar('D', True)
pn = d.getVar('PN', True)
def set_alternative_vars(links, target):
links = d.expand(links)
target = d.expand(target)
f = open('%s%s' % (dvar, links), 'r')
for alt_link_name in f:
alt_link_name = alt_link_name.strip()

2
meta/recipes-devtools/perl/perl_5.22.1.bb
View File

@ -349,7 +349,7 @@ python populate_packages_prepend () {
# modules. Don't attempt to use the result of do_split_packages() as some
# modules are manually split (eg. perl-module-unicore).
packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES', True).split())
d.setVar("RRECOMMENDS_${PN}-modules", ' '.join(packages))
d.setVar(d.expand("RRECOMMENDS_${PN}-modules"), ' '.join(packages))
}
PACKAGES_DYNAMIC += "^perl-module-.*"

2
meta/recipes-gnome/gtk+/gtk+3.inc
View File

@ -106,6 +106,6 @@ python populate_packages_prepend () {
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s')
if (d.getVar('DEBIAN_NAMES', 1)):
d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-3.0')
d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0')
}

2
meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
View File

@ -30,5 +30,5 @@ python populate_packages_prepend () {
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
if (d.getVar('DEBIAN_NAMES', True)):
d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0')
}