aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2018-09-04 16:50:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-07 21:31:16 +0000
commit26138b13baddf8b236ede7f0e01fb39063d65eb1 (patch)
tree1f524fbe75ec28c733caee4c49dd066ad549c165
parent834df7b26c12e4d164a50bcd07b194cb455336ae (diff)
downloadopenembedded-core-contrib-26138b13baddf8b236ede7f0e01fb39063d65eb1.tar.gz
openembedded-core-contrib-26138b13baddf8b236ede7f0e01fb39063d65eb1.tar.bz2
openembedded-core-contrib-26138b13baddf8b236ede7f0e01fb39063d65eb1.zip
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) 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>
-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 f988704756..bf4f815a10 100644
--- a/meta/recipes-core/os-release/os-release.bb
+++ b/meta/recipes-core/os-release/os-release.bb
@@ -1,7 +1,7 @@
inherit allarch
SUMMARY = "Operating system identification"
-DESCRIPTION = "The /etc/os-release file contains operating system identification data."
+DESCRIPTION = "The /usr/lib/os-release file contains operating system identification data."
LICENSE = "MIT"
INHIBIT_DEFAULT_DEPS = "1"
@@ -42,6 +42,9 @@ python do_compile () {
do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
do_install () {
- install -d ${D}${sysconfdir}
- install -m 0644 os-release ${D}${sysconfdir}/
+ install -d ${D}${libdir} ${D}${sysconfdir}
+ install -m 0644 os-release ${D}${libdir}/
+ lnr ${D}${libdir}/os-release ${D}${sysconfdir}/os-release
}
+
+FILES_${PN} += "${libdir}/os-release"