summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2018-10-18 15:24:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-07 21:34:08 (GMT)
commit1b6a6b77912d8721af41b90d764330156a73c8bf (patch)
tree227790bedfd2cdd06b19a62a2d08614753beaa01
parent58d8fd09a590b66e5c0618078310493c4c404bdf (diff)
downloadpoky-1b6a6b77912d8721af41b90d764330156a73c8bf.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) (From OE-Core rev: b1d7ff6eea46af96c84d16111d5327700723cb98) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 bf4f815..7f3d9cb 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 () {
42do_compile[vardeps] += "${OS_RELEASE_FIELDS}" 42do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
43 43
44do_install () { 44do_install () {
45 install -d ${D}${libdir} ${D}${sysconfdir} 45 install -d ${D}${nonarch_libdir} ${D}${sysconfdir}
46 install -m 0644 os-release ${D}${libdir}/ 46 install -m 0644 os-release ${D}${nonarch_libdir}/
47 lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-release 47 lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
48} 48}
49 49
50FILES_${PN} += "${libdir}/os-release" 50FILES_${PN} += "${nonarch_libdir}/os-release"