Skip to contentSkip to conversation

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

PATCH In review Luca Bocassi 4 participants 4 messages Mar 24, 2021

lore
Share & tools
lore
#0 lore raw

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

From: Luca Boccassi <[email protected]>

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

---
 meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +1 -1
index 65e4d23b7e..1ff37a4dcb 100644
@@ -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
Signature · 1 line
2.29.2
#1 lore raw

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

Quoted 24 lines · On 2021-03-24 10:07 a.m., [email protected] wrote:

From: Luca Boccassi <[email protected]>

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

---
 meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +1 -1
index 65e4d23b7e..1ff37a4dcb 100644
@@ -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 lore raw
In reply to Luca Bocassi
Quoted 18 lines · Luca Bocassi

From: Luca Boccassi <[email protected]>

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

---
 meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +0 -0
index 65e4d23b7e..1ff37a4dcb 100644
@@ -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"

meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb PACKAGES = "util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticd · line 14

Quoted 2 lines
meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +1 -1
-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

#3 lore raw
Quoted 28 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Richard Purdie
Sent: den 24 mars 2021 23:46
To: Luca Bocassi <[email protected]>; openembedded- [email protected]
Cc: [email protected]
Subject: Re: [OE-core] [PATCH] util-linux-uuid: include /usr/lib/debug in FILES_util-linux-libuuid-dbg

Review

Quoted 11 lines · Luca Bocassi

From: Luca Boccassi <[email protected]>

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

---
 meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb

meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb PACKAGES = "util-linux-libuuid util-linux-libuuid-dev

Quoted 4 lines

index 65e4d23b7e..1ff37a4dcb 100644

meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +0 -0
@@ -11,7 +11,7 @@ PACKAGES = "util-linux-libuuid util-linux-libuuid-dev

util-linux-libuuid-staticd

Quoted 6 lines
Quoted 2 lines

 FILES_util-linux-libuuid = "${libdir}/libuuid.so.*" FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${includedir}

${libdir}/pkgconfig"

meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb PACKAGES = "util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticd · line 14

Quoted 3 lines

 FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"

meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +1 -1
-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?

Quoted 3 lines

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).

Quoted 8 lines

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