*ping again* //Peter
> -----Original Message----- > From: [email protected] <openembedded- > [email protected]> On Behalf Of Peter Kjellerstedt > Sent: den 3 april 2020 18:24 > To: [email protected] > Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid > an exception if an empty pkgconfig dir exist > > *ping* > > //Peter > > > -----Original Message----- > > From: [email protected] <openembedded- > core- > > [email protected]> On Behalf Of Peter Kjellerstedt > > Sent: den 20 mars 2020 19:04 > > To: [email protected] > > 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 <[email protected]> > > --- > > 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137461): https://lists.openembedded.org/g/openembedded-core/message/137461 Mute This Topic: https://lists.openembedded.org/mt/72396145/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
