aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2018-10-18 09:24:23 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-16 16:32:29 +0000
commit0362788144c3eff36099d8812c85cc70e8736859 (patch)
tree5d0b248d1d4700ca2d4d353b275f9f91af6f087a /meta/recipes-core
parent7ac4ecb04f02a7df943d1f9f0542e28e8f414cc5 (diff)
downloadopenembedded-core-contrib-0362788144c3eff36099d8812c85cc70e8736859.tar.gz
os-release: move to nonarch_libdir
Even on multilib systems, /usr/lib is where systemd expects the os-release file to live. (From OE-Core rev: b7b476efee8c959a0227905e40bd9b5ef493632d) Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/os-release/os-release.bb8
1 files 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 bf4f815a10..7f3d9cba00 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"