[PATCH] util-linux-uuid: include /usr/lib/debug in FILES_util-linux-libuuid-dbg

[PATCH] util-linux-uuid: include /usr/lib/debug in FILES_util-linux-libuuid-dbg

[Luca Bocassi]

From: Luca Boccassi <luca.boccassi@microsoft.com>

Apparently some users have /usr/lib/debug instead of /usr/lib/.debug
so add it to the FILES matching.

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
 meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
index 65e4d23b7e..1ff37a4dcb 100644
--- a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
+++ b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
@@ -11,7 +11,7 @@ PACKAGES = "util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticd
 FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
 FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${includedir} ${libdir}/pkgconfig"
 FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
-FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug"
+FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug ${libdir}/debug"
 
 do_install_append() {
 	rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin
-- 
2.29.2

Re: [PATCH] util-linux-uuid: include /usr/lib/debug in FILES_util-linux-libuuid-dbg

[Scott Branden]

[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]

I can confirm this patch fixes the QA problem I reported.

On 2021-03-24 10:07 a.m., luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <luca.boccassi@microsoft.com>
> 
> Apparently some users have /usr/lib/debug instead of /usr/lib/.debug
> so add it to the FILES matching.
> 
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> ---
>  meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> index 65e4d23b7e..1ff37a4dcb 100644
> --- a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> +++ b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> @@ -11,7 +11,7 @@ PACKAGES = "util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticd
>  FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
>  FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${includedir} ${libdir}/pkgconfig"
>  FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
> -FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug"
> +FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug ${libdir}/debug"
>  
>  do_install_append() {
>  	rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin
> 


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

Re: [OE-core] [PATCH] util-linux-uuid: include /usr/lib/debug in FILES_util-linux-libuuid-dbg

[Richard Purdie]

On Wed, 2021-03-24 at 17:07 +0000, Luca Bocassi wrote:
> From: Luca Boccassi <luca.boccassi@microsoft.com>
> 
> Apparently some users have /usr/lib/debug instead of /usr/lib/.debug
> so add it to the FILES matching.
> 
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> ---
>  meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> index 65e4d23b7e..1ff37a4dcb 100644
> --- a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> +++ b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> @@ -11,7 +11,7 @@ PACKAGES = "util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticd
>  FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
>  FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${includedir} ${libdir}/pkgconfig"
>  FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
> -FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug"
> +FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug ${libdir}/debug"

Is there a reason the recipe is called "util-linux-uuid" yet it wants 
to be "util-linux-libuuid"? I suspect if we can rename it, some of
this juggling goes away. 

Ideally recipes shouldn't be needing to override the defaults for 
PACKAGES and FILES. I just tried a test build with a lot of this stripped
away and its seeing issues with the -dev package but even adding an
RPROVIDES for that would be better than all the above overrides...

Cheers,

Richard

Re: [OE-core] [PATCH] util-linux-uuid: include /usr/lib/debug in FILES_util-linux-libuuid-dbg

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 24 mars 2021 23:46
> To: Luca Bocassi <luca.boccassi@gmail.com>; openembedded-
> core@lists.openembedded.org
> Cc: scott.branden@broadcom.com
> Subject: Re: [OE-core] [PATCH] util-linux-uuid: include /usr/lib/debug in
> FILES_util-linux-libuuid-dbg
> 
> On Wed, 2021-03-24 at 17:07 +0000, Luca Bocassi wrote:
> > From: Luca Boccassi <luca.boccassi@microsoft.com>
> >
> > Apparently some users have /usr/lib/debug instead of /usr/lib/.debug
> > so add it to the FILES matching.
> >
> > Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> > ---
> >  meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> > index 65e4d23b7e..1ff37a4dcb 100644
> > --- a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> > +++ b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
> > @@ -11,7 +11,7 @@ PACKAGES = "util-linux-libuuid util-linux-libuuid-dev
> util-linux-libuuid-staticd
> >  FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
> >  FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${includedir}
> ${libdir}/pkgconfig"
> >  FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
> > -FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug"
> > +FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug ${libdir}/debug"

This is the only occurrence of ${libdir}/debug in OE-Core. Why is it needed 
here if it is a generic thing, when it is not needed anywhere else?
 
> Is there a reason the recipe is called "util-linux-uuid" yet it wants
> to be "util-linux-libuuid"? I suspect if we can rename it, some of
> this juggling goes away.

For what it's worth, it seems the packages end up as libuuid1, libuuid-dbg 
and libuuid-dev anyway. But util-linux-uuid-src retains its original name 
(not sure if that is a bug or working as intended).
 
> Ideally recipes shouldn't be needing to override the defaults for
> PACKAGES and FILES. I just tried a test build with a lot of this stripped
> away and its seeing issues with the -dev package but even adding an
> RPROVIDES for that would be better than all the above overrides...
> 
> Cheers,
> 
> Richard

//Peter