mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 09:16:36 +01:00
6a605120ca
This happens when tryng to add libgcc-dev to as a multilib package (e.g. IMAGE_INSTALL_append = " lib32-libgcc-dev") | Processing task-core-boot... | Processing fman-ucode... | Processing dosfstools... | Processing lib32-libgcc-dev... | Unable to find package lib32-libgcc-dev (libgcc-dev)! NOTE: package fsl-image-full-1.0-r1.1.3.6: task do_rootfs: Failed RPM (or bitbake?) is looking in the tmp/pkgdata, however some of these file paths are mungned for the multilib scenario: $ find tmp/pkgdata/ | grep libgcc-dev$ tmp/pkgdata/ppce5500-fsl-linux/runtime/lib32-libgcc-dev tmp/pkgdata/ppc64e5500-fsl-linux/runtime/libgcc-dev This patch fixes where we look for these files so they can be found and properly installed for the multilib root file system (From OE-Core rev: 4e65ddda5d351bd9f2172e77e656903f61a52f34) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
118 lines
3.2 KiB
Python
118 lines
3.2 KiB
Python
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 = d.expand("${PACKAGE_ARCHS}").split(" ")
|
|
mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None
|
|
|
|
if mlarchs:
|
|
for mlarch in mlarchs.split(" "):
|
|
if "_" in mlarch:
|
|
prefix, split, new_arch = mlarch.partition("_")
|
|
archs.append(new_arch)
|
|
|
|
archs.reverse()
|
|
pkgdata = d.expand('${TMPDIR}/pkgdata/')
|
|
targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
|
|
for arch in archs:
|
|
fn = pkgdata + arch + targetdir + pkg
|
|
if os.path.exists(fn):
|
|
return fn
|
|
return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg)
|
|
|
|
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 = d.expand('${PKGDATA_DIR}/%s' % pn)
|
|
return os.access(fn, os.R_OK)
|
|
|
|
def read_pkgdata(pn, d):
|
|
fn = d.expand('${PKGDATA_DIR}/%s' % pn)
|
|
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, "")
|
|
if newvar == var and var + "_" + pkg in subd:
|
|
continue
|
|
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
|
|
|
|
packages = pkgdata.get("PACKAGES") or ""
|
|
for pkg in 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)
|