Move packagedata code into oe.packagedata (sync from OE)
(From OE-Core rev: e6858627ab087f2f25ebbd6c4422eeae35f3b0ac) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chris Larson
Richard Purdie
parent
2a05bd9be0
commit
e3d0d9897e
|
|
@ -295,7 +295,9 @@ def runstrip(file, elftype, d):
|
|||
#
|
||||
|
||||
def get_package_mapping (pkg, d):
|
||||
data = read_subpkgdata(pkg, d)
|
||||
import oe.packagedata
|
||||
|
||||
data = oe.packagedata.read_subpkgdata(pkg, d)
|
||||
key = "PKG_%s" % pkg
|
||||
|
||||
if key in data:
|
||||
|
|
|
|||
|
|
@ -316,6 +316,7 @@ package_install_internal_rpm () {
|
|||
|
||||
python write_specfile () {
|
||||
import textwrap
|
||||
import oe.packagedata
|
||||
|
||||
# We need to change '-' in a version field to '+'
|
||||
# This needs to be done BEFORE the mapping_rename_hook
|
||||
|
|
@ -328,7 +329,7 @@ python write_specfile () {
|
|||
ver = depends_dict[dep]
|
||||
if dep and ver:
|
||||
if '-' in ver:
|
||||
subd = read_subpkgdata_dict(dep, d)
|
||||
subd = oe.packagedata.read_subpkgdata_dict(dep, d)
|
||||
pv = subd['PV']
|
||||
reppv = pv.replace('-', '+')
|
||||
ver = ver.replace(pv, reppv)
|
||||
|
|
|
|||
|
|
@ -1,73 +1,13 @@
|
|||
def packaged(pkg, d):
|
||||
return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK)
|
||||
|
||||
def read_pkgdatafile(fn):
|
||||
pkgdata = {}
|
||||
|
||||
def decode(str):
|
||||
import codecs
|
||||
c = codecs.getdecoder("string_escape")
|
||||
return c(str)[0]
|
||||
|
||||
if os.access(fn, os.R_OK):
|
||||
import re
|
||||
f = file(fn, 'r')
|
||||
lines = f.readlines()
|
||||
f.close()
|
||||
r = re.compile("([^:]+):\s*(.*)")
|
||||
for l in lines:
|
||||
m = r.match(l)
|
||||
if m:
|
||||
pkgdata[m.group(1)] = decode(m.group(2))
|
||||
|
||||
return pkgdata
|
||||
|
||||
def get_subpkgedata_fn(pkg, d):
|
||||
archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
|
||||
archs.reverse()
|
||||
pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d)
|
||||
targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
|
||||
for arch in archs:
|
||||
fn = pkgdata + arch + targetdir + pkg
|
||||
if os.path.exists(fn):
|
||||
return fn
|
||||
return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
|
||||
|
||||
def has_subpkgdata(pkg, d):
|
||||
return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
|
||||
|
||||
def read_subpkgdata(pkg, d):
|
||||
return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
|
||||
|
||||
def has_pkgdata(pn, d):
|
||||
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
|
||||
return os.access(fn, os.R_OK)
|
||||
|
||||
def read_pkgdata(pn, d):
|
||||
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
|
||||
return read_pkgdatafile(fn)
|
||||
|
||||
python read_subpackage_metadata () {
|
||||
data = read_pkgdata(bb.data.getVar('PN', d, 1), d)
|
||||
import oe.packagedata
|
||||
|
||||
data = oe.packagedata.read_pkgdata(bb.data.getVar('PN', d, 1), d)
|
||||
|
||||
for key in data.keys():
|
||||
bb.data.setVar(key, data[key], d)
|
||||
|
||||
for pkg in bb.data.getVar('PACKAGES', d, 1).split():
|
||||
sdata = read_subpkgdata(pkg, d)
|
||||
sdata = oe.packagedata.read_subpkgdata(pkg, d)
|
||||
for key in sdata.keys():
|
||||
bb.data.setVar(key, sdata[key], d)
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Collapse FOO_pkg variables into FOO
|
||||
#
|
||||
def read_subpkgdata_dict(pkg, d):
|
||||
ret = {}
|
||||
subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
|
||||
for var in subd:
|
||||
newvar = var.replace("_" + pkg, "")
|
||||
ret[newvar] = subd[var]
|
||||
return ret
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
import os
|
||||
import bb.data
|
||||
import codecs
|
||||
|
||||
def packaged(pkg, d):
|
||||
return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK)
|
||||
|
||||
def read_pkgdatafile(fn):
|
||||
pkgdata = {}
|
||||
|
||||
def decode(str):
|
||||
c = codecs.getdecoder("string_escape")
|
||||
return c(str)[0]
|
||||
|
||||
if os.access(fn, os.R_OK):
|
||||
import re
|
||||
f = file(fn, 'r')
|
||||
lines = f.readlines()
|
||||
f.close()
|
||||
r = re.compile("([^:]+):\s*(.*)")
|
||||
for l in lines:
|
||||
m = r.match(l)
|
||||
if m:
|
||||
pkgdata[m.group(1)] = decode(m.group(2))
|
||||
|
||||
return pkgdata
|
||||
|
||||
def get_subpkgedata_fn(pkg, d):
|
||||
archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
|
||||
archs.reverse()
|
||||
pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d)
|
||||
targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
|
||||
for arch in archs:
|
||||
fn = pkgdata + arch + targetdir + pkg
|
||||
if os.path.exists(fn):
|
||||
return fn
|
||||
return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
|
||||
|
||||
def has_subpkgdata(pkg, d):
|
||||
return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
|
||||
|
||||
def read_subpkgdata(pkg, d):
|
||||
return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
|
||||
|
||||
def has_pkgdata(pn, d):
|
||||
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
|
||||
return os.access(fn, os.R_OK)
|
||||
|
||||
def read_pkgdata(pn, d):
|
||||
fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
|
||||
return read_pkgdatafile(fn)
|
||||
|
||||
#
|
||||
# Collapse FOO_pkg variables into FOO
|
||||
#
|
||||
def read_subpkgdata_dict(pkg, d):
|
||||
ret = {}
|
||||
subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
|
||||
for var in subd:
|
||||
newvar = var.replace("_" + pkg, "")
|
||||
ret[newvar] = subd[var]
|
||||
return ret
|
||||
|
||||
def _pkgmap(d):
|
||||
"""Return a dictionary mapping package to recipe name."""
|
||||
|
||||
target_os = d.getVar("TARGET_OS", True)
|
||||
target_vendor = d.getVar("TARGET_VENDOR", True)
|
||||
basedir = os.path.dirname(d.getVar("PKGDATA_DIR", True))
|
||||
|
||||
dirs = ("%s%s-%s" % (arch, target_vendor, target_os)
|
||||
for arch in d.getVar("PACKAGE_ARCHS", True).split())
|
||||
|
||||
pkgmap = {}
|
||||
for pkgdatadir in (os.path.join(basedir, sys) for sys in dirs):
|
||||
try:
|
||||
files = os.listdir(pkgdatadir)
|
||||
except OSError:
|
||||
continue
|
||||
|
||||
for pn in filter(lambda f: not os.path.isdir(os.path.join(pkgdatadir, f)), files):
|
||||
try:
|
||||
pkgdata = read_pkgdatafile(os.path.join(pkgdatadir, pn))
|
||||
except OSError:
|
||||
continue
|
||||
|
||||
for pkg in pkgdata["PACKAGES"].split():
|
||||
pkgmap[pkg] = pn
|
||||
|
||||
return pkgmap
|
||||
|
||||
def pkgmap(d):
|
||||
"""Return a dictionary mapping package to recipe name.
|
||||
Cache the mapping in the metadata"""
|
||||
|
||||
pkgmap_data = d.getVar("__pkgmap_data", False)
|
||||
if pkgmap_data is None:
|
||||
pkgmap_data = _pkgmap(d)
|
||||
d.setVar("__pkgmap_data", pkgmap_data)
|
||||
|
||||
return pkgmap_data
|
||||
|
||||
def recipename(pkg, d):
|
||||
"""Return the recipe name for the given binary package name."""
|
||||
|
||||
return pkgmap(d).get(pkg)
|
||||
Loading…
Reference in New Issue