diff options
Diffstat (limited to 'poky/meta/recipes-extended/lsb')
| -rw-r--r-- | poky/meta/recipes-extended/lsb/lsb_5.0.bb | 6 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/poky/meta/recipes-extended/lsb/lsb_5.0.bb b/poky/meta/recipes-extended/lsb/lsb_5.0.bb index df4812e4b..d1de33400 100644 --- a/poky/meta/recipes-extended/lsb/lsb_5.0.bb +++ b/poky/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} diff --git a/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb b/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb index 46edeed8a..6d3fcf13d 100644 --- a/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb +++ b/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb @@ -2,7 +2,6 @@ SUMMARY = "SysV init scripts which are only used in an LSB image" HOMEPAGE = "https://wiki.debian.org/LSBInitScripts" SECTION = "base" LICENSE = "GPLv2" -DEPENDS = "popt glib-2.0" RPROVIDES_${PN} += "initd-functions" RDEPENDS_${PN} += "util-linux" |