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

PATCH New Richard Purdie 1 participant 1 message Feb 2, 2016

Share & tools

Richard Purdie

author

2016-02-02 13:50 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>

meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +1 -1

index a770168..10457b2 100644
@@ -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

meta/recipes-core/busybox/busybox.inc +2 -0

index e5710f0..f74d1a4 100644
@@ -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()

meta/recipes-devtools/perl/perl_5.22.1.bb +1 -1

index 705852c..54594b1 100644
@@ -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-.*"

meta/recipes-gnome/gtk+/gtk+3.inc +1 -1

index 36f7b0c..353c521 100644
@@ -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')
 }

meta/recipes-gnome/gtk+/gtk+_2.24.29.bb +1 -1

index 675ef6d..cf55d20 100644
@@ -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')
 }