Same issue with kirkstone version: Applying: buildhistory: Fix intermittent package file list creation Using index info to reconstruct a base tree... error: patch failed: meta/classes/buildhistory.bbclass:597 error: meta/classes/buildhistory.bbclass: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Patch failed at 0001 buildhistory: Fix intermittent package file list creation
Steve On Mon, Sep 2, 2024 at 3:23 AM Pedro Ferreira via lists.openembedded.org <pedro.silva.ferreira=criticaltechworks....@lists.openembedded.org> wrote: > > The directory that buildhistory_list_pkg_files writes to during do_package > is created by do_packagedata so a clean buildhistory doesn't have > files-in-package written during the first build since packagedata happens > after do_package. > > Ensure the output package folder is created to avoid missing > files-in-package.txt files. > > Also it ensures that in case of `find` fails we leave with > a hard error instead of hiding the error on the for loop. > > Signed-off-by: Pedro Silva Ferreira > <pedro.silva.ferre...@criticaltechworks.com> > Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> > (cherry picked from commit 8de9b8c1e199896b9a7bc5ed64967c6bfbf84bea) > --- > meta/classes/buildhistory.bbclass | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/buildhistory.bbclass > b/meta/classes/buildhistory.bbclass > index 4345ffc693..b35508db27 100644 > --- a/meta/classes/buildhistory.bbclass > +++ b/meta/classes/buildhistory.bbclass > @@ -597,15 +597,12 @@ buildhistory_list_files_no_owners() { > > buildhistory_list_pkg_files() { > # Create individual files-in-package for each recipe's package > - for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do > + pkgdirlist=$(find ${PKGDEST}/* -maxdepth 0 -type d) > + for pkgdir in $pkgdirlist; do > pkgname=$(basename $pkgdir) > outfolder="${BUILDHISTORY_DIR_PACKAGE}/$pkgname" > outfile="$outfolder/files-in-package.txt" > - # Make sure the output folder exists so we can create the file > - if [ ! -d $outfolder ] ; then > - bbdebug 2 "Folder $outfolder does not exist, file > $outfile not created" > - continue > - fi > + mkdir -p $outfolder > buildhistory_list_files $pkgdir $outfile fakeroot > done > } > -- > 2.34.1 > > The information in this communication may contain confidential or legally > privileged information. It is intended solely for the use of the individual > or entity it addresses and others authorized to receive it. If you are not an > intended recipient, you are hereby notified that any disclosure, copying, > distribution or action in reliance on the contents of this information is > strictly prohibited and may be unlawful. If you have received this > communication by error, please notify us immediately by responding to this > e-mail and then delete it from your system. Critical TechWorks is not liable > for the proper and complete transmission of the information in this > communication nor for any delay in its receipt > > This e-mail is environmentally friendly, just like Critical TechWorks, which > lives in a paper-free atmosphere. Therefore, please consider the environment > before printing it! > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#204169): https://lists.openembedded.org/g/openembedded-core/message/204169 Mute This Topic: https://lists.openembedded.org/mt/108224278/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-