]> code.ossystems Code Review - openembedded-core.git/commit
toaster.bbclass: Correct pkgdatadir path in toaster_package_dumpdata()
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Wed, 11 Dec 2019 01:06:09 +0000 (02:06 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 11 Jan 2020 15:19:21 +0000 (15:19 +0000)
commit5a0f6f631b86f7107aa72453b6d23f32ba39f713
tree3611657b74cafe8baee2582dc5cfb7aea13d6657
parent83899aad423cd36cea7ab2ea210feae5b3359823
toaster.bbclass: Correct pkgdatadir path in toaster_package_dumpdata()

In commit 692b2046 (package: Fix race between do_package and
do_packagedata), the path used for do_packagedata[sstate-inputdirs]
was changed from "${PKGDESTWORK}" to "${WORKDIR}/pkgdata-pdata-input".
This commit adapts the path used for pkgdatadir in
toaster_package_dumpdata() accordingly to avoid setscene errors like:

  ERROR: libgcc-9.2.0-r0 do_packagedata_setscene: Error executing a
  python function in exec_python_func() autogenerated:

  The stack trace of python calls that resulted in this
  exception/failure was:
  File: 'exec_python_func() autogenerated', lineno: 2, function:
  <module>
       0001:
   *** 0002:toaster_package_dumpdata(d)
       0003:
  File: 'meta/classes/toaster.bbclass', lineno: 130, function:
  toaster_package_dumpdata
       0126:    lpkgdata = {}
       0127:    datadir = os.path.join(pkgdatadir, 'runtime')
       0128:
       0129:    # scan and send data for each generated package
   *** 0130:    for datafile in os.listdir(datadir):
       0131:        if not datafile.endswith('.packaged'):
       0132:            lpkgdata = _toaster_load_pkgdatafile(datadir,
       0133:            # Fire an event containing the pkg data
       0134:            bb.event.fire(bb.event.MetadataEvent(
  Exception: FileNotFoundError: [Errno 2] No such file or directory:
  'tmp/work/mips32r2el-nf-poky-linux/libgcc/9.2.0-r0/pkgdata/runtime'

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/toaster.bbclass