libxcrypt: fix hard-coded ".so" extension
PATCH 1/1 libxcrypt: fix hard-coded ".so" extension
From: Etienne Cordonnier <[email protected]>
2 issues:
- the .so extension is hard-coded, and therefore the libxcryt package compiled with meta-darwin is empty, because the dylib files are not contained in FILES_${PN}
- nothing actually produces a file libcrypt-*.so (the symlink file is libcrypt.so, without dash), thus defining FILES:${PN} manually to contain libcrypt-*.so has no effect.
--- meta/recipes-core/libxcrypt/libxcrypt.inc | 6 ------ 1 file changed, 6 deletions(-)
meta/recipes-core/libxcrypt/libxcrypt.inc +0 -6
@@ -17,12 +17,6 @@ SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
Signature · 1 line
2.36.1.vfs.0.0
Hello,
is everything OK with the patch? Is there anything blocking a merge?
Quoted 38 lines · On Fri, May 26, 2023 at 1:52 PM <[email protected]> wrote:
From: Etienne Cordonnier <[email protected]>
2 issues:
- the .so extension is hard-coded, and therefore the libxcryt package compiled with
meta-darwin is empty, because the dylib files are not contained in
FILES_${PN}
- nothing actually produces a file libcrypt-*.so (the symlink file is libcrypt.so, without dash), thus
defining FILES:${PN} manually to contain libcrypt-*.so has no effect.Signed-off-by Etienne Cordonnier <[email protected]>--- meta/recipes-core/libxcrypt/libxcrypt.inc | 6 ------ 1 file changed, 6 deletions(-)meta/recipes-core/libxcrypt/libxcrypt.inc +0
-7@@ -17,12 +17,6 @@ SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" --2.36.1.vfs.0.0
Probably just fell through a crack, I’ve queued it locally for testing.
Sorry about that!
Ross
Quoted 48 lines · Etienne Cordonnier via lists.openembedded.org
Hello,
is everything OK with the patch? Is there anything blocking a merge?On Fri, May 26, 2023 at 1:52 PM <[email protected]> wrote:
From: Etienne Cordonnier <[email protected]>2 issues:
- the .so extension is hard-coded, and therefore the libxcryt package compiled with meta-darwin is empty, because the dylib files are not contained in FILES_${PN}
- nothing actually produces a file libcrypt-*.so (the symlink file is libcrypt.so, without dash), thus defining FILES:${PN} manually to contain libcrypt-*.so has no effect.Signed-off-by Etienne Cordonnier <[email protected]>--- meta/recipes-core/libxcrypt/libxcrypt.inc | 6 ------ 1 file changed, 6 deletions(-)meta/recipes-core/libxcrypt/libxcrypt.inc +0
-6@@ -17,12 +17,6 @@ SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"Signature · 10 lines
2.36.1.vfs.0.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182558): https://lists.openembedded.org/g/openembedded-core/message/182558 Mute This Topic: https://lists.openembedded.org/mt/99149665/6875888 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Quoted 2 lines · Ross Burton
Probably just fell through a crack, I’ve queued it locally for testing.
It didn't apply cleanly on my master-next and I was waiting for things to calm down to get back to it.
Quoted 57 lines
Sorry about that!
Ross
Quoted 42 lines · Etienne Cordonnier via lists.openembedded.org
Hello,
is everything OK with the patch? Is there anything blocking a merge?On Fri, May 26, 2023 at 1:52 PM <[email protected]> wrote:
From: Etienne Cordonnier <[email protected]>2 issues:
- the .so extension is hard-coded, and therefore the libxcryt package compiled with meta-darwin is empty, because the dylib files are not contained in FILES_${PN}
- nothing actually produces a file libcrypt-*.so (the symlink file is libcrypt.so, without dash), thus defining FILES:${PN} manually to contain libcrypt-*.so has no effect.Signed-off-by Etienne Cordonnier <[email protected]>--- meta/recipes-core/libxcrypt/libxcrypt.inc | 6 ------ 1 file changed, 6 deletions(-)meta/recipes-core/libxcrypt/libxcrypt.inc +0
-6@@ -17,12 +17,6 @@ SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"Signature · 1 line
2.36.1.vfs.0.0-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182559): https://lists.openembedded.org/g/openembedded-core/message/182559
Mute This Topic: https://lists.openembedded.org/mt/99149665/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 2 lines
It didn't apply cleanly on my master-next and I was waiting for things to calm down to get back to it.
OK, thanks for the update. Don't hesitate to let me know in case I should rebase the patch to avoid a git conflict. It seems to work on the latest master-next. The files in libxcrypt and libxcrypt-dev are the same before and after the patch:
$ oe-pkgdata-util list-pkg-files libxcrypt libxcrypt: /usr/lib/libcrypt.so.2 /usr/lib/libcrypt.so.2.0.0
libxcrypt-dev:/usr/include/crypt.h/usr/lib/libcrypt.so/usr/lib/pkgconfig/libcrypt.pc/usr/lib/pkgconfig/libxcrypt.pc
Quoted 71 lines · Alexandre Belloni
Quoted 2 lines · Ross Burton
Probably just fell through a crack, I’ve queued it locally for testing.
It didn't apply cleanly on my master-next and I was waiting for things to calm down to get back to it.
Quoted 5 lines
Sorry about that!
Ross
Quoted 1 line
On 9 Jun 2023, at 10:37, Etienne Cordonnier via lists.openembedded.org
Quoted 9 lines · <[email protected]> wrote:
Quoted 9 lines
Hello,
is everything OK with the patch? Is there anything blocking a merge?On Fri, May 26, 2023 at 1:52 PM <[email protected]> wrote:
From: Etienne Cordonnier <[email protected]>2 issues:
- the .so extension is hard-coded, and therefore the libxcryt packagecompiled with
Quoted 1 line
Quoted 1 line
meta-darwin is empty, because the dylib files are not contained in
FILES_${PN}
Quoted 1 line
Quoted 1 line
- nothing actually produces a file libcrypt-*.so (the symlink file is
libcrypt.so, without dash), thus
Quoted 8 lines
Review
Quoted 8 lines
defining FILES:${PN} manually to contain libcrypt-*.so has no effect.Signed-off-by Etienne Cordonnier <[email protected]>--- meta/recipes-core/libxcrypt/libxcrypt.inc | 6 ------ 1 file changed, 6 deletions(-)(quoted diff) +0
-0b/meta/recipes-core/libxcrypt/libxcrypt.inc
Quoted 15 lines
Quoted 15 lines
index
61b0381076..454a55d73d100644meta/recipes-core/libxcrypt/libxcrypt.inc +0
-6@@ -17,12 +17,6 @@ SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES:${PN} = "${libdir}/libcrypt*.so.* \ - ${libdir}/libcrypt-*.so \ - ${libdir}/libowcrypt*.so.* \ - ${libdir}/libowcrypt-*.so \ -" - S = "${WORKDIR}/git"Quoted 12 lines
Quoted 7 lines
meta/recipes-core/libxcrypt/libxcrypt.inc +0
-1BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" --2.36.1.vfs.0.0
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering