Patchwork util-linux: collect symbol link libxx.so for related libxx-dev package

login
register
mail settings
Submitter Qiang Chen
Date Nov. 14, 2013, 7:40 a.m.
Message ID <1384414827-5485-1-git-send-email-qiang.chen@windriver.com>
Download mbox | patch
Permalink /patch/61675/
State New
Headers show

Comments

Qiang Chen - Nov. 14, 2013, 7:40 a.m.
From: Qiang Chen <qiang.chen@windriver.com>

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.

Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
---
 meta/recipes-core/util-linux/util-linux.inc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Saul Wold - Nov. 14, 2013, 5:27 p.m.
On 11/13/2013 11:40 PM, qiang.chen@windriver.com wrote:
> From: Qiang Chen <qiang.chen@windriver.com>
>
> 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.
>
> Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
> Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
> ---
>   meta/recipes-core/util-linux/util-linux.inc |    6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 15b6770..e25fbd6 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -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"
>

Don't the .la files need to be with the .so files.

Sau!

>   FILES_util-linux-fsck = "${base_sbindir}/fsck*"
>
Qiang Chen - Nov. 18, 2013, 2:16 a.m.
On 11/15/2013 01:27 AM, Saul Wold wrote:

> On 11/13/2013 11:40 PM, qiang.chen@windriver.com wrote:
>> From: Qiang Chen <qiang.chen@windriver.com>
>> 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.
>> Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
>> Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
>> ---
>>    meta/recipes-core/util-linux/util-linux.inc |    6 +++---
>>    1 file changed, 3 insertions(+), 3 deletions(-)
>> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
>> index 15b6770..e25fbd6 100644
>> --- a/meta/recipes-core/util-linux/util-linux.inc
>> +++ b/meta/recipes-core/util-linux/util-linux.inc
>> @@ -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"
> 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

> Sau!
>>    FILES_util-linux-fsck = "${base_sbindir}/fsck*"
>

Patch

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 15b6770..e25fbd6 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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*"