On Wed, Jun 17, 2020 at 3:50 AM Peter Kjellerstedt <peter.kjellerst...@axis.com> wrote: > > This has been integrated to master now (commit f9c5df6d). > Please cherry-pick it to Dunfell and Zeus. > > //Peter > > > -----Original Message----- > > From: openembedded-core@lists.openembedded.org <openembedded- > > c...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > Sent: den 12 juni 2020 18:26 > > To: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid > > an exception if an empty pkgconfig dir exist > > > > *ping* *ping* *ping* *ping* > > > > Ok, it was only two weeks since I pinged this the last time, but > > since I'm going on vacation in a week I thought I'd give it a shot > > before then. I am still waiting for any kind of reaction to this > > patch... > > > > //Peter > > > > > -----Original Message----- > > > From: openembedded-core@lists.openembedded.org <openembedded- > > > c...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > > Sent: den 28 maj 2020 03:26 > > > To: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid > > > an exception if an empty pkgconfig dir exist > > > > > > *ping* *ping* *ping* > > > > > > I am not sure why this is being ignored. It is two months since I > > > first sent it and the third time I ping it. I have not received any > > > objections, yet it has never made it even to master-next as far as > > > I know. > > > > > > This should not be taken as a complaint. I know there has been > > > problems with the autobuilder and that patch integration has been > > > slowed, and during this time all other patches I have sent have > > > been applied on the first try. So it just seems to be this one that > > > has been left out, and I would like to know if there is a reason or > > > if it just has fallen between the cracks. > > > > > > //Peter > > > > > > PS. The patch of course applies to Dunfell now too in addition to > > > master and Zeus since it has been released in the meantime. > > > > > > > -----Original Message----- > > > > From: openembedded-core@lists.openembedded.org <openembedded- > > > c...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > > > Sent: den 25 april 2020 11:17 > > > > To: openembedded-core@lists.openembedded.org > > > > Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: > > Avoid > > > an exception if an empty pkgconfig dir exist > > > > > > > > *ping again* > > > > > > > > //Peter > > > > > > > > > -----Original Message----- > > > > > From: openembedded-core@lists.openembedded.org <openembedded- > > > c...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > > > > Sent: den 3 april 2020 18:24 > > > > > To: openembedded-core@lists.openembedded.org > > > > > Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: > > > Avoid an exception if an empty pkgconfig dir exist > > > > > > > > > > *ping* > > > > > > > > > > //Peter > > > > > > > > > > > -----Original Message----- > > > > > > From: openembedded-core-boun...@lists.openembedded.org > > > <openembedded-core-boun...@lists.openembedded.org> On Behalf Of Peter > > > Kjellerstedt > > > > > > Sent: den 20 mars 2020 19:04 > > > > > > To: openembedded-core@lists.openembedded.org > > > > > > Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass: > > Avoid > > > an exception if an empty pkgconfig dir exist > > > > > > > > > > > > Rewrite relocatable_native_pcfiles() so that it can handle that > > any > > > of > > > > > > the checked pkgconfig directories are empty without causing an > > > > > > exception. > > > > > > > > > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com> > > > > > > --- > > > > > > meta/classes/relocatable.bbclass | 20 +++++++++++--------- > > > > > > 1 file changed, 11 insertions(+), 9 deletions(-) > > > > > > > > > > > > diff --git a/meta/classes/relocatable.bbclass > > > b/meta/classes/relocatable.bbclass > > > > > > index 582812c1cf..af04be5cca 100644 > > > > > > --- a/meta/classes/relocatable.bbclass > > > > > > +++ b/meta/classes/relocatable.bbclass > > > > > > @@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { > > > > > > rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) > > > > > > } > > > > > > > > > > > > -relocatable_native_pcfiles () { > > > > > > - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then > > > > > > - rel=${@os.path.relpath(d.getVar('base_prefix'), > > > d.getVar('libdir') + "/pkgconfig")} > > > > > > - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" > > > ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc > > > > > > - fi > > > > > > - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then > > > > > > - rel=${@os.path.relpath(d.getVar('base_prefix'), > > > d.getVar('datadir') + "/pkgconfig")} > > > > > > - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" > > > ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc > > > > > > - fi > > > > > > +relocatable_native_pcfiles() { > > > > > > + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do > > > > > > + files_template=${SYSROOT_DESTDIR}$dir/*.pc > > > > > > + # Expand to any files matching $files_template > > > > > > + files=$(echo $files_template) > > > > > > + # $files_template and $files will differ if any > > > files were found > > > > > > + if [ "$files_template" != "$files" ]; then > > > > > > + rel=$(realpath -m --relative-to=$dir > > > ${base_prefix}) > > > > > > + sed -i -e > > > "s:${base_prefix}:\${pcfiledir}/$rel:g" $files > > > > > > + fi > > > > > > + done > > > > > > } > > > > > > -- > > > > > > 2.21.1 > > > > > > > > > > //Peter Bisected it: Since this one is in dunfell I am unable to build on autobuilder. I see
| virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/openembedded-core/meta/recipes-extended/libnsl/libnsl2_git.bb:do_compile | virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/openembedded-core/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb:do_compile | virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb:do_compile Makefile says (don't have *.pc at the moment): LIBUSB_CFLAGS = -I/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/build/tmp-glibc/work/x86_64-linux/libmtp-native/1.1.17-r0/recipe-sysroot-native/usr/lib/pkgconfig//usr/include/libusb-1.0 LIBUSB_LIBS = -L/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/build/tmp-glibc/work/x86_64-linux/libmtp-native/1.1.17-r0/recipe-sysroot-native/usr/lib/pkgconfig//usr/lib -lusb-1.0 so libusb.h is not found (yes the path is wrong). Why do we replace by ${pcfiledir} exactly? Andreas
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142072): https://lists.openembedded.org/g/openembedded-core/message/142072 Mute This Topic: https://lists.openembedded.org/mt/72396145/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-