Return-Path: Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mail.openembedded.org (Postfix) with ESMTP id DEAF37FA42 for ; Sun, 22 Dec 2019 13:01:41 +0000 (UTC) IronPort-SDR: TIFlLf9BQY6CpdrtrTN8Ns5XeYlpQyO5Y5MmCySV8j1q/yJftz3z+x9LhoCTgVHvyvKlwV9aRo YkSsHNfKlSqu9k9UzBvsbo4ffylr+UZ0BCh0h8BdFu5LIhJuRuPHUbXf77rvdpdsx1ROjss18U 4j1luqqNAj1z9+Zhs4gmbAl8cf0vXYtINbsJIpQfaUPMOpf2DN1diT8xbLTLTLcc2wUOK4LKK0 esn3DQkcDHS5j2F5uvzOtX1tAxp4PnZV0+z2JlXeywynEYDSImtpgJGqTUj2VM3uv2lxz5z0eW vhE= X-IronPort-AV: E=Sophos;i="5.69,343,1571695200"; d="scan'208";a="3837036" From: Peter Kjellerstedt To: "openembedded-core@lists.openembedded.org" Thread-Topic: [OE-core] [master][zeus][PATCH] toaster.bbclass: Correct pkgdatadir path in toaster_package_dumpdata() Thread-Index: AQHVr788StpW5q4b/kmfm5MeBIEBvafGMEaQ Date: Sun, 22 Dec 2019 13:01:42 +0000 Message-ID: References: <20191211010609.4295-1-pkj@axis.com> In-Reply-To: <20191211010609.4295-1-pkj@axis.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.0.5.60] MIME-Version: 1.0 Subject: Re: [master][zeus][PATCH] toaster.bbclass: Correct pkgdatadir path in toaster_package_dumpdata() X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2019 13:01:42 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable *ping* //Peter > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org bounces@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > Sent: den 11 december 2019 02:06 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [master][zeus][PATCH] toaster.bbclass: Correct > pkgdatadir path in toaster_package_dumpdata() >=20 > 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: >=20 > ERROR: libgcc-9.2.0-r0 do_packagedata_setscene: Error executing a > python function in exec_python_func() autogenerated: >=20 > The stack trace of python calls that resulted in this > exception/failure was: > File: 'exec_python_func() autogenerated', lineno: 2, function: > > 0001: > *** 0002:toaster_package_dumpdata(d) > 0003: > File: 'meta/classes/toaster.bbclass', lineno: 130, function: > toaster_package_dumpdata > 0126: lpkgdata =3D {} > 0127: datadir =3D 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 =3D _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' >=20 > Signed-off-by: Peter Kjellerstedt > --- > meta/classes/toaster.bbclass | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) >=20 > diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass > index 6cef0b8f6e..6a65ecb957 100644 > --- a/meta/classes/toaster.bbclass > +++ b/meta/classes/toaster.bbclass > @@ -113,7 +113,7 @@ def _toaster_load_pkgdatafile(dirpath, filepath): > pass # ignore lines without valid key: value pairs > return pkgdata >=20 > -python toaster_package_dumpdata() { > +def _toaster_dumpdata(pkgdatadir, d): > """ > Dumps the data about the packages created by a recipe > """ > @@ -122,7 +122,6 @@ python toaster_package_dumpdata() { > if not d.getVar('PACKAGES'): > return >=20 > - pkgdatadir =3D d.getVar('PKGDESTWORK') > lpkgdata =3D {} > datadir =3D os.path.join(pkgdatadir, 'runtime') >=20 > @@ -132,6 +131,14 @@ python toaster_package_dumpdata() { > lpkgdata =3D _toaster_load_pkgdatafile(datadir, datafile) > # Fire an event containing the pkg data > bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", > lpkgdata), d) > + > +python toaster_package_dumpdata() { > + _toaster_dumpdata(d.getVar('PKGDESTWORK'), d) > +} > + > +python toaster_packagedata_dumpdata() { > + # This path needs to match do_packagedata[sstate-inputdirs] > + _toaster_dumpdata(os.path.join(d.getVar('WORKDIR'), 'pkgdata-pdata- > input'), d) > } >=20 > # 2. Dump output image files information > @@ -366,8 +373,8 @@ toaster_buildhistory_dump[eventmask] =3D > "bb.event.BuildCompleted" > addhandler toaster_artifacts > toaster_artifacts[eventmask] =3D "bb.runqueue.runQueueTaskSkipped > bb.runqueue.runQueueTaskCompleted" >=20 > -do_packagedata_setscene[postfuncs] +=3D "toaster_package_dumpdata " > -do_packagedata_setscene[vardepsexclude] +=3D "toaster_package_dumpdata " > +do_packagedata_setscene[postfuncs] +=3D "toaster_packagedata_dumpdata " > +do_packagedata_setscene[vardepsexclude] +=3D "toaster_packagedata_dumpda= ta > " >=20 > do_package[postfuncs] +=3D "toaster_package_dumpdata " > do_package[vardepsexclude] +=3D "toaster_package_dumpdata " > -- > 2.21.0 >=20 > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core