summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:25 +0100
commit86d30d756a60d181a95cf07041920a367a0cd0ba (patch)
tree950353e2e1cd1e7b812ff941b4d06076acd2c752 /meta/classes/package.bbclass
parentf98c8490099a02c42306e1671579631a61c9df73 (diff)
downloadpoky-86d30d756a60d181a95cf07041920a367a0cd0ba.tar.gz
meta: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` (From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index d58f19794b..cd92beb394 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -425,7 +425,7 @@ def get_package_mapping (pkg, basepkg, d):
425def get_package_additional_metadata (pkg_type, d): 425def get_package_additional_metadata (pkg_type, d):
426 base_key = "PACKAGE_ADD_METADATA" 426 base_key = "PACKAGE_ADD_METADATA"
427 for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): 427 for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
428 if d.getVar(key) is None: 428 if d.getVar(key, False) is None:
429 continue 429 continue
430 d.setVarFlag(key, "type", "list") 430 d.setVarFlag(key, "type", "list")
431 if d.getVarFlag(key, "separator") is None: 431 if d.getVarFlag(key, "separator") is None:
@@ -1154,7 +1154,7 @@ populate_packages[dirs] = "${D}"
1154python package_fixsymlinks () { 1154python package_fixsymlinks () {
1155 import errno 1155 import errno
1156 pkgdest = d.getVar('PKGDEST', True) 1156 pkgdest = d.getVar('PKGDEST', True)
1157 packages = d.getVar("PACKAGES").split() 1157 packages = d.getVar("PACKAGES", False).split()
1158 1158
1159 dangling_links = {} 1159 dangling_links = {}
1160 pkg_files = {} 1160 pkg_files = {}