summaryrefslogtreecommitdiff
path: root/classes/package.bbclass
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-10-30 12:48:03 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-10-30 12:48:03 +0100
commit056193c6638892ddde7bddbfc6f6f06a2288ba64 (patch)
tree4b25482f6fcf171512013cc640f6c476b870b2de /classes/package.bbclass
parent4ab9ea946965be0b9dd3d15396dd70fea78b2aad (diff)
Revert "package.bbclass: Cleanup getVar syntax to use True, not 1 as third argument (from Poky)"
This reverts commit fcee557e1b0551d1743bbb3ad61102b9ccc4cba8.
Diffstat (limited to 'classes/package.bbclass')
-rw-r--r--classes/package.bbclass120
1 files changed, 60 insertions, 60 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index e7865754eb..7a9b987c7c 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -28,12 +28,12 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
"""
import os, os.path, bb
- dvar = bb.data.getVar('D', d, True)
+ dvar = bb.data.getVar('D', d, 1)
if not dvar:
bb.error("D not defined")
return
- packages = bb.data.getVar('PACKAGES', d, True).split()
+ packages = bb.data.getVar('PACKAGES', d, 1).split()
if postinst:
postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -94,7 +94,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
the_files.append(aux_files_pattern_verbatim % m.group(1))
bb.data.setVar('FILES_' + pkg, " ".join(the_files), d)
if extra_depends != '':
- the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, True)
+ the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, 1)
if the_depends:
the_depends = '%s %s' % (the_depends, extra_depends)
else:
@@ -106,7 +106,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
if postrm:
bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
else:
- oldfiles = bb.data.getVar('FILES_' + pkg, d, True)
+ oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
if not oldfiles:
bb.fatal("Package '%s' exists but has no files" % pkg)
bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
@@ -152,7 +152,7 @@ def runstrip(file, d):
import bb, os, commands, stat
- pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
+ pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1)
ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
@@ -169,8 +169,8 @@ def runstrip(file, d):
bb.debug(2, "Already ran strip on %s" % file)
return 0
- strip = bb.data.getVar("STRIP", d, True)
- objcopy = bb.data.getVar("OBJCOPY", d, True)
+ strip = bb.data.getVar("STRIP", d, 1)
+ objcopy = bb.data.getVar("OBJCOPY", d, 1)
newmode = None
if not os.access(file, os.W_OK):
@@ -268,10 +268,10 @@ def get_package_mapping (pkg, d):
def runtime_mapping_rename (varname, d):
import bb, os
- #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))
+ #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1)))
new_depends = []
- for depend in explode_deps(bb.data.getVar(varname, d, True) or ""):
+ for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""):
# Have to be careful with any version component of the depend
split_depend = depend.split(' (')
new_depend = get_package_mapping(split_depend[0].strip(), d)
@@ -282,7 +282,7 @@ def runtime_mapping_rename (varname, d):
bb.data.setVar(varname, " ".join(new_depends) or None, d)
- #bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, True)))
+ #bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1)))
#
# Package functions suitable for inclusion in PACKAGEFUNCS
@@ -291,23 +291,23 @@ def runtime_mapping_rename (varname, d):
python package_do_split_locales() {
import os
- if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'):
+ if (bb.data.getVar('PACKAGE_NO_LOCALE', d, 1) == '1'):
bb.debug(1, "package requested not splitting locales")
return
- packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
+ packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
- datadir = bb.data.getVar('datadir', d, True)
+ datadir = bb.data.getVar('datadir', d, 1)
if not datadir:
bb.note("datadir not defined")
return
- dvar = bb.data.getVar('D', d, True)
+ dvar = bb.data.getVar('D', d, 1)
if not dvar:
bb.error("D not defined")
return
- pn = bb.data.getVar('PN', d, True)
+ pn = bb.data.getVar('PN', d, 1)
if not pn:
bb.error("PN not defined")
return
@@ -346,27 +346,27 @@ python package_do_split_locales() {
python populate_packages () {
import glob, stat, errno, re
- workdir = bb.data.getVar('WORKDIR', d, True)
+ workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
bb.error("WORKDIR not defined, unable to package")
return
import os # path manipulations
- outdir = bb.data.getVar('DEPLOY_DIR', d, True)
+ outdir = bb.data.getVar('DEPLOY_DIR', d, 1)
if not outdir:
bb.error("DEPLOY_DIR not defined, unable to package")
return
bb.mkdirhier(outdir)
- dvar = bb.data.getVar('D', d, True)
+ dvar = bb.data.getVar('D', d, 1)
if not dvar:
bb.error("D not defined, unable to package")
return
bb.mkdirhier(dvar)
- packages = bb.data.getVar('PACKAGES', d, True)
+ packages = bb.data.getVar('PACKAGES', d, 1)
- pn = bb.data.getVar('PN', d, True)
+ pn = bb.data.getVar('PN', d, 1)
if not pn:
bb.error("PN not defined")
return
@@ -392,19 +392,19 @@ python populate_packages () {
else:
package_list.append(pkg)
- if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'):
+ if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
for root, dirs, files in os.walk(dvar):
for f in files:
file = os.path.join(root, f)
if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
runstrip(file, d)
- pkgdest = bb.data.getVar('PKGDEST', d, True)
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
os.system('rm -rf %s' % pkgdest)
seen = []
main_is_empty = 1
- main_pkg = bb.data.getVar('PN', d, True)
+ main_pkg = bb.data.getVar('PN', d, 1)
for pkg in package_list:
localdata = bb.data.createCopy(d)
@@ -412,13 +412,13 @@ python populate_packages () {
bb.mkdirhier(root)
bb.data.setVar('PKG', pkg, localdata)
- overrides = bb.data.getVar('OVERRIDES', localdata, True)
+ overrides = bb.data.getVar('OVERRIDES', localdata, 1)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.update_data(localdata)
- filesvar = bb.data.getVar('FILES', localdata, True) or ""
+ filesvar = bb.data.getVar('FILES', localdata, 1) or ""
files = filesvar.split()
for file in files:
if os.path.isabs(file):
@@ -473,7 +473,7 @@ python populate_packages () {
bb.build.exec_func("package_name_hook", d)
for pkg in package_list:
- pkgname = bb.data.getVar('PKG_%s' % pkg, d, True)
+ pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
if pkgname is None:
bb.data.setVar('PKG_%s' % pkg, pkg, d)
@@ -532,11 +532,11 @@ python emit_pkgdata() {
c = codecs.getencoder("string_escape")
return c(str)[0]
- val = bb.data.getVar('%s_%s' % (var, pkg), d, True)
+ val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
if val:
f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
return
- val = bb.data.getVar('%s' % (var), d, True)
+ val = bb.data.getVar('%s' % (var), d, 1)
if val:
f.write('%s: %s\n' % (var, encode(val)))
return
@@ -554,7 +554,7 @@ python emit_pkgdata() {
f.close()
package_stagefile(data_file, d)
- workdir = bb.data.getVar('WORKDIR', d, True)
+ workdir = bb.data.getVar('WORKDIR', d, 1)
for pkg in packages.split():
subdata_file = pkgdatadir + "/runtime/%s" % pkg
@@ -582,9 +582,9 @@ python emit_pkgdata() {
#if pkgdatadir2:
# bb.copyfile(subdata_file, pkgdatadir2 + "/runtime/%s" % pkg)
- allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True)
+ allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
if not allow_empty:
- allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True)
+ allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
root = "%s/install/%s" % (workdir, pkg)
os.chdir(root)
g = glob('*') + glob('.[!.]*')
@@ -618,21 +618,21 @@ python package_do_shlibs() {
lib_re = re.compile("^lib.*\.so")
libdir_re = re.compile(".*/lib$")
- packages = bb.data.getVar('PACKAGES', d, True)
+ packages = bb.data.getVar('PACKAGES', d, 1)
- workdir = bb.data.getVar('WORKDIR', d, True)
+ workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
bb.error("WORKDIR not defined")
return
- ver = bb.data.getVar('PV', d, True)
+ ver = bb.data.getVar('PV', d, 1)
if not ver:
bb.error("PV not defined")
return
- pkgdest = bb.data.getVar('PKGDEST', d, True)
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
- shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
+ shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
bb.mkdirhier(shlibs_dir)
pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
@@ -650,12 +650,12 @@ python package_do_shlibs() {
use_ldconfig = False
needed = {}
- private_libs = bb.data.getVar('PRIVATE_LIBS', d, True)
+ private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
for pkg in packages.split():
needs_ldconfig = False
bb.debug(2, "calculating shlib provides for %s" % pkg)
- pkgver = bb.data.getVar('PV_' + pkg, d, True)
+ pkgver = bb.data.getVar('PV_' + pkg, d, 1)
if not pkgver:
pkgver = ver
@@ -668,8 +668,8 @@ python package_do_shlibs() {
soname = None
path = os.path.join(root, file)
if (os.access(path, os.X_OK) or lib_re.match(file)) and not os.path.islink(path):
- cmd = bb.data.getVar('OBJDUMP', d, True) + " -p " + path + " 2>/dev/null"
- cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, True), cmd)
+ cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
+ cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd)
fd = os.popen(cmd)
lines = fd.readlines()
fd.close()
@@ -708,10 +708,10 @@ python package_do_shlibs() {
package_stagefile(shver_file, d)
if needs_ldconfig and use_ldconfig:
bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
- postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, True) or bb.data.getVar('pkg_postinst', d, True)
+ postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
if not postinst:
postinst = '#!/bin/sh\n'
- postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True)
+ postinst += bb.data.getVar('ldconfig_postinst_fragment', d, 1)
bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
if pstageactive == "1":
@@ -738,7 +738,7 @@ python package_do_shlibs() {
for l in lines:
shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
- assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True)
+ assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
if assumed_libs:
for e in assumed_libs.split():
l, dep_pkg = e.split(":")
@@ -786,16 +786,16 @@ python package_do_shlibs() {
python package_do_pkgconfig () {
import re, os
- packages = bb.data.getVar('PACKAGES', d, True)
+ packages = bb.data.getVar('PACKAGES', d, 1)
- workdir = bb.data.getVar('WORKDIR', d, True)
+ workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
bb.error("WORKDIR not defined")
return
- pkgdest = bb.data.getVar('PKGDEST', d, True)
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
- shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
+ shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
bb.mkdirhier(shlibs_dir)
pc_re = re.compile('(.*)\.pc$')
@@ -890,7 +890,7 @@ python package_do_pkgconfig () {
}
python read_shlibdeps () {
- packages = bb.data.getVar('PACKAGES', d, True).split()
+ packages = bb.data.getVar('PACKAGES', d, 1).split()
for pkg in packages:
rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
for extension in ".shlibdeps", ".pcdeps", ".clilibdeps":
@@ -918,14 +918,14 @@ python package_depchains() {
package.
"""
- packages = bb.data.getVar('PACKAGES', d, True)
- postfixes = (bb.data.getVar('DEPCHAIN_POST', d, True) or '').split()
- prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, True) or '').split()
+ packages = bb.data.getVar('PACKAGES', d, 1)
+ postfixes = (bb.data.getVar('DEPCHAIN_POST', d, 1) or '').split()
+ prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
#bb.note('depends for %s is %s' % (base, depends))
- rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
+ rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
for depend in depends:
if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
@@ -946,7 +946,7 @@ python package_depchains() {
def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
#bb.note('rdepends for %s is %s' % (base, rdepends))
- rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
+ rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
for depend in rdepends:
if depend.endswith('-dev'):
@@ -966,15 +966,15 @@ python package_depchains() {
list.append(dep)
depends = []
- for dep in explode_deps(bb.data.getVar('DEPENDS', d, True) or ""):
+ for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""):
add_dep(depends, dep)
rdepends = []
- for dep in explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""):
+ for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""):
add_dep(rdepends, dep)
for pkg in packages.split():
- for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, True) or ""):
+ for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""):
add_dep(rdepends, dep)
#bb.note('rdepends is %s' % rdepends)
@@ -1007,7 +1007,7 @@ python package_depchains() {
pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
else:
rdeps = []
- for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, True) or bb.data.getVar('RDEPENDS', d, True) or ""):
+ for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""):
add_dep(rdeps, dep)
pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
}
@@ -1035,7 +1035,7 @@ def package_run_hooks(f, d):
bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d)
line += 1
fp.close()
- anonqueue = bb.data.getVar("__anonqueue", d, True) or []
+ anonqueue = bb.data.getVar("__anonqueue", d, 1) or []
body = [x['content'] for x in anonqueue]
flag = { 'python' : 1, 'func' : 1 }
bb.data.setVar("__anonfunc", "\n".join(body), d)
@@ -1054,12 +1054,12 @@ def package_run_hooks(f, d):
bb.data.delVar("__anonfunc", d)
python package_do_package () {
- packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
+ packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
if len(packages) < 1:
bb.debug(1, "No packages to build, skipping do_package")
return
- for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split():
+ for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split():
bb.build.exec_func(f, d)
package_run_hooks(f, d)
}