summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-02 13:50:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:39:00 +0000
commit6ab50017e18cbb5eeeee2df9075fdfa54d05489f (patch)
treec19e07a3e7c63c881339bc625cdca5b6714cb295
parente8860f77a2099d41cab3bdd290c801596bcfbba4 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.29.bb2
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
-rw-r--r--meta/recipes-devtools/perl/perl_5.22.1.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.29.bb2
5 files changed, 6 insertions, 4 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
90fi 90fi
91""" 91"""
92 d.setVar('pkg_preinst_${PN}', preinst) 92 d.setVar(d.expand('pkg_preinst_${PN}'), preinst)
93} 93}
94 94
95addtask do_package after do_populate_sysroot 95addtask 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()
diff --git a/meta/recipes-devtools/perl/perl_5.22.1.bb b/meta/recipes-devtools/perl/perl_5.22.1.bb
index 705852c01c..54594b1dfc 100644
--- a/meta/recipes-devtools/perl/perl_5.22.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.1.bb
@@ -349,7 +349,7 @@ python populate_packages_prepend () {
349 # modules. Don't attempt to use the result of do_split_packages() as some 349 # modules. Don't attempt to use the result of do_split_packages() as some
350 # modules are manually split (eg. perl-module-unicore). 350 # modules are manually split (eg. perl-module-unicore).
351 packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES', True).split()) 351 packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES', True).split())
352 d.setVar("RRECOMMENDS_${PN}-modules", ' '.join(packages)) 352 d.setVar(d.expand("RRECOMMENDS_${PN}-modules"), ' '.join(packages))
353} 353}
354 354
355PACKAGES_DYNAMIC += "^perl-module-.*" 355PACKAGES_DYNAMIC += "^perl-module-.*"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 36f7b0c06c..353c521a89 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -106,6 +106,6 @@ python populate_packages_prepend () {
106 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') 106 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s')
107 107
108 if (d.getVar('DEBIAN_NAMES', 1)): 108 if (d.getVar('DEBIAN_NAMES', 1)):
109 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-3.0') 109 d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0')
110} 110}
111 111
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.29.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
index 675ef6d80b..cf55d2070a 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.29.bb
@@ -30,5 +30,5 @@ python populate_packages_prepend () {
30 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 30 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
31 31
32 if (d.getVar('DEBIAN_NAMES', True)): 32 if (d.getVar('DEBIAN_NAMES', True)):
33 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0') 33 d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0')
34} 34}