Patchwork [1/2,v2] dbus: move libdbus-1.so* to base_libdir

login
register
mail settings
Submitter jackie huang
Date June 20, 2013, 11:18 a.m.
Message ID <3ef249426f06250a0cb952abaa4f2f0bce40c1c5.1371726748.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/52115/
State New
Headers show

Comments

jackie huang - June 20, 2013, 11:18 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

move libdbus-1.so* to base_libdir to kill a warning:

    WARNING: QA Issue: lib32-consolekit: /lib/security/
    pam_ck_connector.so, installed in the base_prefix,
    requires a shared library under exec_prefix (/usr):
    libdbus-1.so.3 => /usr/lib/libdbus-1.so.3 (0xdead3000)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-core/dbus/dbus.inc |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 8055824..919d17e 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -12,7 +12,7 @@  DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl"
 RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}"
 RDEPENDS_class-native = ""
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch; \
@@ -116,6 +116,14 @@  do_install() {
 
 	# Remove /var/run as it is created on startup
 	rm -rf ${D}${localstatedir}/run
+
+	# Move libdbus-1.so.3* to base_libdir
+	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+	        mkdir -p ${D}/${base_libdir}/
+	        mv -f ${D}${libdir}/libdbus-1.so.3* ${D}${base_libdir}/
+	        rel_lib_prefix=${@os.path.relpath(d.getVar('base_libdir', True), d.getVar('libdir', True))}
+	        ln -sf ${rel_lib_prefix}/libdbus-1.so.3.7.2 ${D}${libdir}/libdbus-1.so
+	fi
 }
 
 do_install_class-native() {