summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
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 /meta/recipes-gnome
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>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.29.bb2
2 files changed, 2 insertions, 2 deletions
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}