Skip to contentSkip to conversation

os-release: move to nonarch_libdir

PATCH In review Dan McGregor 3 participants 3 messages Oct 18, 2018 – Oct 19, 2018

lore
Share & tools
lore

Dan McGregor

author
#0 lore raw

PATCH 1/1 os-release: move to nonarch_libdir

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>
---
 meta/recipes-core/os-release/os-release.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/os-release/os-release.bb +4 -4
index bf4f815a10d..7f3d9cba00c 100644
@@ -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"
Signature · 1 line
2.19.0-dev
#1 lore raw

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 <[email protected]>
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 <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

Best Regards,
Chen Qi

Quoted 28 lines · Dan McGregor

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>
---
  meta/recipes-core/os-release/os-release.bb | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/os-release/os-release.bb +4 -4
index bf4f815a10d..7f3d9cba00c 100644
@@ -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 lore raw
Quoted 11 lines · 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 <[email protected]>
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

Quoted 39 lines

    (From OE-Core rev: 361382ca16c276e1e404eab58c0956a2b6d23d7e)

Signed-off-by Kai Kang <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

Best Regards,
Chen Qi

Quoted 26 lines · Dan McGregor

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>

---
  meta/recipes-core/os-release/os-release.bb | 8 ++++----

  1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/os-release/os-release.bb +0 -0
index bf4f815a10d..7f3d9cba00c 100644
@@ -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"

Signature · 2 lines
Regards,
Neil | Kai Kang