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.k...@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.k...@windriver.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
Best Regards,
Chen Qi
On 10/18/2018 11:24 PM, Dan McGregor wrote:
From: Dan McGregor <dan.mcgre...@usask.ca>
Even on multilib systems, /usr/lib is where systemd expects the
os-release file to live.
Signed-off-by: Dan McGregor <dan.mcgre...@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"
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
