summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass24
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 5c42619f3f..e8c449711f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -195,10 +195,10 @@ def splitfile(file, debugfile, debugsrcdir, d):
195 dvar = d.getVar('PKGD', True) 195 dvar = d.getVar('PKGD', True)
196 pathprefix = "export PATH=%s; " % d.getVar('PATH', True) 196 pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
197 objcopy = d.getVar("OBJCOPY", True) 197 objcopy = d.getVar("OBJCOPY", True)
198 debugedit = bb.data.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit", d) 198 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
199 workdir = d.getVar("WORKDIR", True) 199 workdir = d.getVar("WORKDIR", True)
200 workparentdir = os.path.dirname(workdir) 200 workparentdir = os.path.dirname(workdir)
201 sourcefile = bb.data.expand("${WORKDIR}/debugsources.list", d) 201 sourcefile = d.expand("${WORKDIR}/debugsources.list")
202 202
203 # We ignore kernel modules, we don't generate debug info files. 203 # We ignore kernel modules, we don't generate debug info files.
204 if file.find("/lib/modules/") != -1 and file.endswith(".ko"): 204 if file.find("/lib/modules/") != -1 and file.endswith(".ko"):
@@ -238,11 +238,11 @@ def splitfile2(debugsrcdir, d):
238 pathprefix = "export PATH=%s; " % d.getVar('PATH', True) 238 pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
239 strip = d.getVar("STRIP", True) 239 strip = d.getVar("STRIP", True)
240 objcopy = d.getVar("OBJCOPY", True) 240 objcopy = d.getVar("OBJCOPY", True)
241 debugedit = bb.data.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit", d) 241 debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
242 workdir = d.getVar("WORKDIR", True) 242 workdir = d.getVar("WORKDIR", True)
243 workparentdir = os.path.dirname(workdir) 243 workparentdir = os.path.dirname(workdir)
244 workbasedir = os.path.basename(workdir) 244 workbasedir = os.path.basename(workdir)
245 sourcefile = bb.data.expand("${WORKDIR}/debugsources.list", d) 245 sourcefile = d.expand("${WORKDIR}/debugsources.list")
246 246
247 if debugsrcdir: 247 if debugsrcdir:
248 nosuchdir = [] 248 nosuchdir = []
@@ -624,7 +624,7 @@ python fixup_perms () {
624 if len(lsplit) != 8 and not (len(lsplit) == 3 and lsplit[1].lower() == "link"): 624 if len(lsplit) != 8 and not (len(lsplit) == 3 and lsplit[1].lower() == "link"):
625 bb.error("Fixup perms: %s invalid line: %s" % (conf, line)) 625 bb.error("Fixup perms: %s invalid line: %s" % (conf, line))
626 continue 626 continue
627 entry = fs_perms_entry(bb.data.expand(line, d)) 627 entry = fs_perms_entry(d.expand(line))
628 if entry and entry.path: 628 if entry and entry.path:
629 fs_perms_table[entry.path] = entry 629 fs_perms_table[entry.path] = entry
630 f.close() 630 f.close()
@@ -1071,9 +1071,9 @@ python emit_pkgdata() {
1071 pkgdatadir = d.getVar('PKGDESTWORK', True) 1071 pkgdatadir = d.getVar('PKGDESTWORK', True)
1072 1072
1073 # Take shared lock since we're only reading, not writing 1073 # Take shared lock since we're only reading, not writing
1074 lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d), True) 1074 lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}"), True)
1075 1075
1076 data_file = pkgdatadir + bb.data.expand("/${PN}" , d) 1076 data_file = pkgdatadir + d.expand("/${PN}" )
1077 f = open(data_file, 'w') 1077 f = open(data_file, 'w')
1078 f.write("PACKAGES: %s\n" % packages) 1078 f.write("PACKAGES: %s\n" % packages)
1079 f.close() 1079 f.close()
@@ -1154,7 +1154,7 @@ python package_do_filedeps() {
1154 pkgdest = d.getVar('PKGDEST', True) 1154 pkgdest = d.getVar('PKGDEST', True)
1155 packages = d.getVar('PACKAGES', True) 1155 packages = d.getVar('PACKAGES', True)
1156 1156
1157 rpmdeps = bb.data.expand("${RPMDEPS}", d) 1157 rpmdeps = d.expand("${RPMDEPS}")
1158 r = re.compile(r'[<>=]+ +[^ ]*') 1158 r = re.compile(r'[<>=]+ +[^ ]*')
1159 1159
1160 # Quick routine to process the results of the rpmdeps call... 1160 # Quick routine to process the results of the rpmdeps call...
@@ -1253,7 +1253,7 @@ python package_do_shlibs() {
1253 shlibswork_dir = d.getVar('SHLIBSWORKDIR', True) 1253 shlibswork_dir = d.getVar('SHLIBSWORKDIR', True)
1254 1254
1255 # Take shared lock since we're only reading, not writing 1255 # Take shared lock since we're only reading, not writing
1256 lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) 1256 lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}"))
1257 1257
1258 def linux_so(root, path, file): 1258 def linux_so(root, path, file):
1259 cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" 1259 cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null"
@@ -1499,7 +1499,7 @@ python package_do_pkgconfig () {
1499 if m: 1499 if m:
1500 name = m.group(1) 1500 name = m.group(1)
1501 val = m.group(2) 1501 val = m.group(2)
1502 pd.setVar(name, bb.data.expand(val, pd)) 1502 pd.setVar(name, pd.expand(val))
1503 continue 1503 continue
1504 m = field_re.match(l) 1504 m = field_re.match(l)
1505 if m: 1505 if m:
@@ -1509,7 +1509,7 @@ python package_do_pkgconfig () {
1509 pkgconfig_needed[pkg] += exp.replace(',', ' ').split() 1509 pkgconfig_needed[pkg] += exp.replace(',', ' ').split()
1510 1510
1511 # Take shared lock since we're only reading, not writing 1511 # Take shared lock since we're only reading, not writing
1512 lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) 1512 lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}"))
1513 1513
1514 for pkg in packages.split(): 1514 for pkg in packages.split():
1515 pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") 1515 pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist")
@@ -1560,7 +1560,7 @@ python read_shlibdeps () {
1560 rdepends = bb.utils.explode_dep_versions(d.getVar('RDEPENDS_' + pkg, False) or d.getVar('RDEPENDS', False) or "") 1560 rdepends = bb.utils.explode_dep_versions(d.getVar('RDEPENDS_' + pkg, False) or d.getVar('RDEPENDS', False) or "")
1561 1561
1562 for extension in ".shlibdeps", ".pcdeps", ".clilibdeps": 1562 for extension in ".shlibdeps", ".pcdeps", ".clilibdeps":
1563 depsfile = bb.data.expand("${PKGDEST}/" + pkg + extension, d) 1563 depsfile = d.expand("${PKGDEST}/" + pkg + extension)
1564 if os.access(depsfile, os.R_OK): 1564 if os.access(depsfile, os.R_OK):
1565 fd = file(depsfile) 1565 fd = file(depsfile)
1566 lines = fd.readlines() 1566 lines = fd.readlines()