Re: [PATCH v2 2/5] external-arm-toolchain: Refine dev libraries/headers packaging

["Denys Dmytriyenko" <denis@denix.org>]

On Fri, Jun 12, 2020 at 12:37:43PM +0530, Sumit Garg wrote:
> On Fri, 12 Jun 2020 at 09:53, Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > On Wed, Jun 10, 2020 at 07:12:59PM +0530, Sumit Garg wrote:
> > > OE core by default package all libraries/headers installed as
> > > "${libdir}/lib*.so", "${libdir}/*.la" and {includedir} as part of
> > > FILES_${PN}-dev" but in case of external Arm toolchain recipe, multiple
> > > packages are provided which needs to include specific libraries and
> > > headers. So define "FILES_${PN}-dev" from scratch in order to package
> > > dev libraries/headers as part of intended packages and only package
> > > remaining libraries/headers as part of "FILES_${PN}-dev".
> >
> > This is probably fine, but have you considered/tried re-ordering list of
> > PACKAGES, moving ${PN}-dev to the end? That way it would let other packages
> > to pick up their files before collecting the remainder. Not sure, but I wonder
> > if that would be any cleaner...
> >
> 
> Your suggestion sounded useful, so I gave it a try but unfortunately
> OE core still prefers to package libraries and headers as part of
> "FILES_${PN}-dev" rather than other intended packages.

Sorry, I may not have been very clear. I didn't mean moving FILES_${PN}-dev 
position in the recipe, but rather ${PN}-dev position inside PACKAGES list.

So, if you have FILES_a = "*" and FILES_b = "*" it all depends on which one is 
listed first in PACKAGES to get all the files: PACKAGES = "a b" or "b a"

This have happened in the past few times, e.g this one is very clear to 
illustrate the point:

http://arago-project.org/git/?p=meta-arago.git;a=commitdiff;h=fd2587171fec09ffb2974fc7b402ae6daf9ebaea

In that case, libgcc-dev had to be moved to the very front of the list to get 
a chance to pick up the file, which would otherwise go into another package.

But then, immediate expansion (as _remove wasn't available back then) or the 
use of actual _remove maybe fine for downstream, but otherwise is discouraged. 

So, if nothing else works, just re-defining FILES_${PN}-dev should be fine.


> Fyi, I just did following change instead of this patch which wasn't successful:
> 
> @@ -703,6 +655,17 @@ SUMMARY_libitm-dev = "GNU transactional memory
> support library - development fil
>  FILES_libitm-staticdev = "${libdir}/libitm.a"
>  SUMMARY_libitm-staticdev = "GNU transactional memory support library
> - static development files"
> 
> +# Package remaining dev libraries and headers
> +FILES_${PN}-dev = "\
> +       ${includedir} \
> +       ${base_libdir}/*_nonshared.a \
> +       ${base_libdir}/*.o \
> +       ${datadir}/aclocal \
> +       ${libdir}/*.o \
> +       ${libdir}/*_nonshared.a \
> +       ${libdir}/*.so \
> +    "
> +
>  EAT_VER_MAIN ??= ""
> 
> -Sumit
> 
> >
> > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
> > > ---
> > >  .../external-arm-toolchain.bb                      | 48 ++++++++++++++++++++++
> > >  1 file changed, 48 insertions(+)
> > >
> > > diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
> > > index 8cfc208..5d9a0a8 100644
> > > --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
> > > +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
> > > @@ -546,6 +546,54 @@ FILES_${PN} += "\
> > >       ${base_libdir}/libpcprofile.so \
> > >      "
> > >
> > > +FILES_${PN}-dev = "\
> > > +     ${includedir}/*.h \
> > > +     ${includedir}/netatalk/ \
> > > +     ${includedir}/netiucv/ \
> > > +     ${includedir}/neteconet/ \
> > > +     ${includedir}/nfs/ \
> > > +     ${includedir}/rpcsvc/ \
> > > +     ${includedir}/netipx/ \
> > > +     ${includedir}/misc/ \
> > > +     ${includedir}/rpc/ \
> > > +     ${includedir}/sys/ \
> > > +     ${includedir}/netrose/ \
> > > +     ${includedir}/arpa/ \
> > > +     ${includedir}/netinet/ \
> > > +     ${includedir}/netrom/ \
> > > +     ${includedir}/finclude/ \
> > > +     ${includedir}/netax25/ \
> > > +     ${includedir}/netash/ \
> > > +     ${includedir}/bits/ \
> > > +     ${includedir}/xen/ \
> > > +     ${includedir}/netpacket/ \
> > > +     ${includedir}/drm/ \
> > > +     ${includedir}/net/ \
> > > +     ${includedir}/protocols/ \
> > > +     ${includedir}/gnu/ \
> > > +     ${base_libdir}/*_nonshared.a \
> > > +     ${base_libdir}/*.o \
> > > +     ${datadir}/aclocal \
> > > +     ${libdir}/*.o \
> > > +     ${libdir}/*_nonshared.a \
> > > +     ${libdir}/libcrypt.so \
> > > +     ${libdir}/libc.so \
> > > +     ${libdir}/libm.so \
> > > +     ${libdir}/libpthread.so \
> > > +     ${libdir}/libresolv.so \
> > > +     ${libdir}/librt.so \
> > > +     ${libdir}/libutil.so \
> > > +     ${libdir}/libnss_files.so \
> > > +     ${libdir}/libnss_compat.so \
> > > +     ${libdir}/libnss_dns.so \
> > > +     ${libdir}/libnss_hesiod.so \
> > > +     ${libdir}/libnss_db.so \
> > > +     ${libdir}/libdl.so \
> > > +     ${libdir}/libanl.so \
> > > +     ${libdir}/libBrokenLocale.so \
> > > +     ${libdir}/libthread_db.so \
> > > +    "
> > > +
> > >  FILES_${PN}-dbg += "${base_libdir}/debug"
> > >
> > >  # From gcc-runtime.inc
> > > --
> > > 2.7.4
> > >
>