summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2018-09-04 15:50:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-07 21:34:08 (GMT)
commit58d8fd09a590b66e5c0618078310493c4c404bdf (patch)
tree68e8d541cb3b2ef55ba46091b81ddc1a896f9d05
parentd6ea55c28ad1345012785e4b620b4155f4de3efa (diff)
downloadpoky-58d8fd09a590b66e5c0618078310493c4c404bdf.tar.gz
os-release: fix to install in the expected location
os-release (5) recommends that the os-release file be installed in /usr/lib/os-release and that /etc/os-release be a relative symlink to it. (From OE-Core rev: 4feb8614ee25a3d3ceb7f5187120a1256a993155) (From OE-Core rev: 4e67fa950cd3ca6e44d7f46743904d23a756e498) (From OE-Core rev: 26138b13baddf8b236ede7f0e01fb39063d65eb1) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> 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> 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.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb
index f988704..bf4f815 100644
--- a/meta/recipes-core/os-release/os-release.bb
+++ b/meta/recipes-core/os-release/os-release.bb
@@ -1,7 +1,7 @@
1inherit allarch 1inherit allarch
2 2
3SUMMARY = "Operating system identification" 3SUMMARY = "Operating system identification"
4DESCRIPTION = "The /etc/os-release file contains operating system identification data." 4DESCRIPTION = "The /usr/lib/os-release file contains operating system identification data."
5LICENSE = "MIT" 5LICENSE = "MIT"
6INHIBIT_DEFAULT_DEPS = "1" 6INHIBIT_DEFAULT_DEPS = "1"
7 7
@@ -42,6 +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}${sysconfdir} 45 install -d ${D}${libdir} ${D}${sysconfdir}
46 install -m 0644 os-release ${D}${sysconfdir}/ 46 install -m 0644 os-release ${D}${libdir}/
47 lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-release
47} 48}
49
50FILES_${PN} += "${libdir}/os-release"