summaryrefslogtreecommitdiffstats
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-07 21:31:16 +0000
commitb1d7ff6eea46af96c84d16111d5327700723cb98 (patch)
treeb83c8a0e5d1fc0a58bd31e51b9036a738426ee03
parent26138b13baddf8b236ede7f0e01fb39063d65eb1 (diff)
downloadopenembedded-core-b1d7ff6eea46af96c84d16111d5327700723cb98.tar.gz
openembedded-core-b1d7ff6eea46af96c84d16111d5327700723cb98.tar.bz2
openembedded-core-b1d7ff6eea46af96c84d16111d5327700723cb98.zip
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>
-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"