a4e36563d9
Instead of using a rather error-prone method of looking for output package files in order to determine if a package got created, use the .packaged file within pkgdata. This fixes two separate issues: * Some packages apparently not being found by this code e.g. all apm/apmd packages when using ipk packaging. * Buggy implementation of this checking code which triggered an exception during the event handler if PKGV was overridden on a per-package basis (as it is with external-sourcery-toolchain), which blocked Hob from completing parsing at 99% - fixes [YOCTO #2651]. (From OE-Core rev: 48169c6bc44c546cecaa06207b6c36da558b81f7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
29 lines
1.4 KiB
Text
29 lines
1.4 KiB
Text
python packageinfo_handler () {
|
|
if isinstance(e, bb.event.RequestPackageInfo):
|
|
import oe.packagedata
|
|
pkginfolist = []
|
|
tmpdir = e.data.getVar('TMPDIR', True)
|
|
target_vendor = e.data.getVar('TARGET_VENDOR', True)
|
|
target_os = e.data.getVar('TARGET_OS', True)
|
|
package_archs = e.data.getVar('PACKAGE_ARCHS', True)
|
|
packaging = e.data.getVar('PACKAGE_CLASSES', True).split()[0].split('_')[1]
|
|
deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging
|
|
for arch in package_archs.split():
|
|
pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' + target_os + '/runtime/'
|
|
if os.path.exists(pkgdata_dir):
|
|
for root, dirs, files in os.walk(pkgdata_dir):
|
|
for pkgname in files:
|
|
if pkgname.endswith('.packaged'):
|
|
pkgname = pkgname[:-9]
|
|
pkgdatafile = root + pkgname
|
|
try:
|
|
sdata = oe.packagedata.read_pkgdatafile(pkgdatafile)
|
|
sdata['PKG'] = pkgname
|
|
pkginfolist.append(sdata)
|
|
except Exception as e:
|
|
bb.warn("Failed to read pkgdata file %s: %s: %s" % (pkgdatafile, e.__class__, str(e)))
|
|
bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data)
|
|
}
|
|
|
|
addhandler packageinfo_handler
|