[PATCH] os-release: move to nonarch_libdir

[PATCH] os-release: move to nonarch_libdir

[Dan McGregor]

From: Dan McGregor <dan.mcgregor@usask.ca>

Even on multilib systems, /usr/lib is where systemd expects the
os-release file to live.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 meta/recipes-core/os-release/os-release.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb
index bf4f815a10d..7f3d9cba00c 100644
--- a/meta/recipes-core/os-release/os-release.bb
+++ b/meta/recipes-core/os-release/os-release.bb
@@ -42,9 +42,9 @@ python do_compile () {
 do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
 
 do_install () {
-    install -d ${D}${libdir} ${D}${sysconfdir}
-    install -m 0644 os-release ${D}${libdir}/
-    lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-release
+    install -d ${D}${nonarch_libdir} ${D}${sysconfdir}
+    install -m 0644 os-release ${D}${nonarch_libdir}/
+    lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
 }
 
-FILES_${PN} += "${libdir}/os-release"
+FILES_${PN} += "${nonarch_libdir}/os-release"
-- 
2.19.0-dev

Re: [PATCH] os-release: move to nonarch_libdir

[ChenQi]

I suspect this is the correct fix for multilib conflict of os-release 
after the allarch/multilib change.
Kai, could you please verify if the following patch could be dropped 
with this patch applied?

commit 591a11ba58ce3c2c147bb1f8202bc6a0092b70eb
Author: Kai Kang <kai.kang@windriver.com>
Date:   Wed Oct 3 00:27:14 2018 +0800

     os-release: avoid multilib expand

     Add os-release to NON_MULTILIB_RECIPES in multilib.conf that do not do
     multilib expand for os-release.

     (From OE-Core rev: 361382ca16c276e1e404eab58c0956a2b6d23d7e)

     Signed-off-by: Kai Kang <kai.kang@windriver.com>
     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Best Regards,
Chen Qi

On 10/18/2018 11:24 PM, Dan McGregor wrote:
> From: Dan McGregor <dan.mcgregor@usask.ca>
>
> Even on multilib systems, /usr/lib is where systemd expects the
> os-release file to live.
>
> Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
> ---
>   meta/recipes-core/os-release/os-release.bb | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb
> index bf4f815a10d..7f3d9cba00c 100644
> --- a/meta/recipes-core/os-release/os-release.bb
> +++ b/meta/recipes-core/os-release/os-release.bb
> @@ -42,9 +42,9 @@ python do_compile () {
>   do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
>   
>   do_install () {
> -    install -d ${D}${libdir} ${D}${sysconfdir}
> -    install -m 0644 os-release ${D}${libdir}/
> -    lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-release
> +    install -d ${D}${nonarch_libdir} ${D}${sysconfdir}
> +    install -m 0644 os-release ${D}${nonarch_libdir}/
> +    lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
>   }
>   
> -FILES_${PN} += "${libdir}/os-release"
> +FILES_${PN} += "${nonarch_libdir}/os-release"

Re: [PATCH] os-release: move to nonarch_libdir

[Kang Kai]

On 2018/10/19 上午10:21, ChenQi wrote:
> I suspect this is the correct fix for multilib conflict of os-release 
> after the allarch/multilib change.
> Kai, could you please verify if the following patch could be dropped 
> with this patch applied?
>
> commit 591a11ba58ce3c2c147bb1f8202bc6a0092b70eb
> Author: Kai Kang <kai.kang@windriver.com>
> Date:   Wed Oct 3 00:27:14 2018 +0800
>
>     os-release: avoid multilib expand
>
>     Add os-release to NON_MULTILIB_RECIPES in multilib.conf that do 
> not do
>     multilib expand for os-release.


This commit is to fix file conflict of /etc/os-release between 
lib32-os-release and os-release.
When install os-release to nonarch_libdir, the issue is gone. So my 
commit could be reverted
when this commit is merged. Tested for qemux86-64.

--Kai



>
>     (From OE-Core rev: 361382ca16c276e1e404eab58c0956a2b6d23d7e)
>
>     Signed-off-by: Kai Kang <kai.kang@windriver.com>
>     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> Best Regards,
> Chen Qi
>
> On 10/18/2018 11:24 PM, Dan McGregor wrote:
>> From: Dan McGregor <dan.mcgregor@usask.ca>
>>
>> Even on multilib systems, /usr/lib is where systemd expects the
>> os-release file to live.
>>
>> Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
>> ---
>>   meta/recipes-core/os-release/os-release.bb | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-core/os-release/os-release.bb 
>> b/meta/recipes-core/os-release/os-release.bb
>> index bf4f815a10d..7f3d9cba00c 100644
>> --- a/meta/recipes-core/os-release/os-release.bb
>> +++ b/meta/recipes-core/os-release/os-release.bb
>> @@ -42,9 +42,9 @@ python do_compile () {
>>   do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
>>     do_install () {
>> -    install -d ${D}${libdir} ${D}${sysconfdir}
>> -    install -m 0644 os-release ${D}${libdir}/
>> -    lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-release
>> +    install -d ${D}${nonarch_libdir} ${D}${sysconfdir}
>> +    install -m 0644 os-release ${D}${nonarch_libdir}/
>> +    lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
>>   }
>>   -FILES_${PN} += "${libdir}/os-release"
>> +FILES_${PN} += "${nonarch_libdir}/os-release"
>
>
>

-- 
Regards,
Neil | Kai Kang