util-linux: collect symbol link libxx.so for related libxx-dev package
PATCH 1/1 util-linux: collect symbol link libxx.so for related libxx-dev package
From: Qiang Chen <[email protected]>
Commit 91c0f9e3 moves library files to base_libdir for safe while symbol link libuuid.so and libblkid.so are placed in libdir, not base_libdir. Thus they are missed by related develop package and collected by util-linux's develop package at last. Fix it.
--- meta/recipes-core/util-linux/util-linux.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +3 -3
@@ -74,11 +74,11 @@ FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" +FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" FILES_util-linux-lscpu = "${bindir}/lscpu" FILES_util-linux-fsck = "${base_sbindir}/fsck*"
Signature · 1 line
1.7.9.5
Quoted 21 lines · On 11/13/2013 11:40 PM, [email protected] wrote:
From: Qiang Chen <[email protected]>
Commit
91c0f9e3moves library files tobase_libdirfor safe while symbol link libuuid.so and libblkid.so are placed in libdir, notbase_libdir. Thus they are missed by related develop package and collected by util-linux's develop package at last. Fix it.Signed-off-by Zhang Xiao <[email protected]>Signed-off-by Qiang Chen <[email protected]>--- meta/recipes-core/util-linux/util-linux.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-core/util-linux/util-linux.inc +0
-0@@ -74,11 +74,11 @@ FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
meta/recipes-core/util-linux/util-linux.inc FILES_util-linux-reset = "${base_bindir}/reset" · line 83
Quoted 10 lines
meta/recipes-core/util-linux/util-linux.inc +3
-3-FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" +FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" FILES_util-linux-lscpu = "${bindir}/lscpu"
Don't the .la files need to be with the .so files.
Sau!
Quoted 2 lines
meta/recipes-core/util-linux/util-linux.inc +0
-0FILES_util-linux-fsck = "${base_sbindir}/fsck*"
Quoted 20 lines · Saul Wold
Quoted 19 lines · On 11/13/2013 11:40 PM, [email protected] wrote:
From: Qiang Chen <[email protected]>
Commit91c0f9e3moves library files tobase_libdirfor safe while symbol link libuuid.so and libblkid.so are placed in libdir, notbase_libdir. Thus they are missed by related develop package and collected by util-linux's develop package at last. Fix it.Signed-off-by Zhang Xiao <[email protected]>Signed-off-by Qiang Chen <[email protected]>--- meta/recipes-core/util-linux/util-linux.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-core/util-linux/util-linux.inc +1
-1@@ -74,11 +74,11 @@ FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
Quoted 8 lines
meta/recipes-core/util-linux/util-linux.inc FILES_util-linux-reset = "${base_bindir}/reset" · line 82
Quoted 7 lines
meta/recipes-core/util-linux/util-linux.inc +2
-2FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" +FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" FILES_util-linux-lscpu = "${bindir}/lscpu"Don't the .la files need to be with the .so files.
Yes, I missed these .la files.
The .la files also located at libdir not base_libdir, so I will send V2 patch.
Thanks Sau !
Qiang
Quoted 3 lines
Sau!
Quoted 1 line
meta/recipes-core/util-linux/util-linux.inc +0
-0FILES_util-linux-fsck = "${base_sbindir}/fsck*"