summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2018-07-20 14:18:16 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-26 13:16:31 +0100
commit852c9498ae365bc8c149b5e6df0c8667bd885c79 (patch)
treecf54d793b69729c6aff4240d51e64ef191c09b20 /meta
parent20532131201a39eb6415cdf34fb1f8b837e52436 (diff)
downloadopenembedded-core-contrib-852c9498ae365bc8c149b5e6df0c8667bd885c79.tar.gz
openembedded-core-contrib-852c9498ae365bc8c149b5e6df0c8667bd885c79.tar.bz2
openembedded-core-contrib-852c9498ae365bc8c149b5e6df0c8667bd885c79.zip
lsb: fix usrmerge install paths
${base_prefix} is set in bitbake.conf to empty. This makes lsb_release always install under /bin which is a problem if usrmerge is in DISTRO_FEATURES, because it needs to be installed under /usr/bin. By using ${root_prefix} instead, we fix the usrmerge install path and the following QA warning goes away while keeping the non-usrmerge path identical. WARNING: lsb-5.0-r0 do_package: QA Issue: lsb: Files/directories were installed but not shipped in any package: /bin /bin/lsb_release Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. lsb: 2 installed and not shipped files. [installed-vs-shipped] Also if usrmerge is defined don't try to create the lib64 symlink because base-files handles it to avoid the do_rootfs error Collected errors: * check_data_file_clashes: Package lsb wants to install file tmp-glibc/work/x64-nilrt-linux/test-image/1.0-r0/rootfs/lib64 But that file is already provided by package * base-files Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lsb/lsb_5.0.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/lsb/lsb_5.0.bb b/meta/recipes-extended/lsb/lsb_5.0.bb
index df4812e4bc..d1de334008 100644
--- a/meta/recipes-extended/lsb/lsb_5.0.bb
+++ b/meta/recipes-extended/lsb/lsb_5.0.bb
@@ -34,7 +34,7 @@ S = "${WORKDIR}/lsb-release-1.4"
CLEANBROKEN = "1"
do_install() {
- oe_runmake install prefix=${D}${base_prefix} mandir=${D}${datadir}/man/ DESTDIR=${D}
+ oe_runmake install prefix=${D}${root_prefix} mandir=${D}${datadir}/man/ DESTDIR=${D}
# these two dirs are needed by package lsb-dist-checker
mkdir -p ${D}${sysconfdir}/opt
@@ -99,7 +99,9 @@ do_install_append() {
fi
if [ "${TARGET_ARCH}" = "x86_64" ]; then
- if [ "${base_libdir}" != "${base_prefix}/lib64" ]; then
+ # don't symlink if usrmerge is in DISTRO_FEATURES as it manages the symlink
+ if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)} && \
+ [ "${base_libdir}" != "${base_prefix}/lib64" ]; then
lnr ${D}${base_libdir} ${D}${base_prefix}/lib64
fi
cd ${D}${base_libdir}