[poky][meta][os-release] Error building after commit c539765288bf3bc2c8578e037ce8fc9c2323b745

[poky][meta][os-release] Error building after commit c539765288bf3bc2c8578e037ce8fc9c2323b745

[nick83ola]

[-- Attachment #1: Type: text/plain, Size: 3413 bytes --]

Hi,
after this patch I get this build error.
If I revert this all disappear.


system: docker image from crops (ubuntu 16.04)

Regards
Nicola Lunghi

=============================================

ERROR: os-release-1.0-r0 do_install: Function failed: do_install (log file
is located at
/workspace/vegas-demo/build-imx7/tmp/work/all-poky-linux/os-release/1.0-r0/temp/log.do_install.169)

ERROR: Logfile of failure stored in:
/workspace/vegas-demo/build-imx7/tmp/work/all-poky-linux/os-release/1.0-r0/temp/log.do_install.169

Log data follows:
| DEBUG: Executing python function extend_recipe_sysroot
| NOTE: Direct dependencies are
['virtual:native:/workspace/vegas-demo/poky/meta/recipes-devtools/pseudo/pseudo_git.bb:do_populate_sysroot',
'/workspace/vegas-demo/poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb:
do_populate_sysroot']
| NOTE: Installed into sysroot: []
| NOTE: Skipping as already exists in sysroot: ['pseudo-native',
'quilt-native']
| DEBUG: Python function extend_recipe_sysroot finished
| DEBUG: Executing shell function do_install
| mv:
'/workspace/vegas-demo/build-imx7/tmp/work/all-poky-linux/os-release/1.0-r0/image/etc/os-release'
and
'/workspace/vegas-demo/build-imx7/tmp/work/all-poky-linux/os-release/1.0-r0/image/usr/lib/os-release'
are the same file
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_install (log file is located at
/workspace/vegas-demo/build-imx7/tmp/work/all-poky-linux/os-release/1.0-r0/temp/log.do_install.169)

ERROR: Task
(/workspace/vegas-demo/poky/meta/recipes-core/os-release/os-release.bb:do_install)
failed with exit code
'1'

NOTE: Tasks Summary: Attempted 3835 tasks of which 3834 didn't need to be
rerun and 1 failed.
NOTE: Writing buildhistory

======================================================


commit c539765288bf3bc2c8578e037ce8fc9c2323b745
Author: Joshua Lock <joshua.g.lock@intel.com>
Date:   Tue Sep 4 16:50:00 2018 +0100

    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)

    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>

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"

[-- Attachment #2: Type: text/html, Size: 4975 bytes --]