consolekit: fix two QA warnings
v2 cover consolekit: fix two QA warnings
From: Jackie Huang <[email protected]>
Tested with:DISTRO_FEATURES += 'pam'WARN_QA = "unsafe-references-in-binaries unsafe-references-in-scripts"
---
The following changes since commit defa05f2085f78d9ec9ada7051c284e1fc72e6c1:
bdwgc-native: Add missing pkgconfig DEPENDS (2013-06-19 18:03:21 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_consolekit_dbus_0620_2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_consolekit_dbus_0620_2
Jackie Huang (2):
dbus: move libdbus-1.so* to base_libdir
consolekit: move libck-connector to base_libdir
meta/recipes-core/dbus/dbus.inc | 10 +++++++++- .../recipes-support/consolekit/consolekit_0.4.5.bb | 14 +++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.4.1
PATCH v2 1/2 dbus: move libdbus-1.so* to base_libdir
From: Jackie Huang <[email protected]>
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)
--- meta/recipes-core/dbus/dbus.inc | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
meta/recipes-core/dbus/dbus.inc +9 -1
@@ -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() {
Signature · 1 line
1.7.4.1
PATCH v2 2/2 consolekit: move libck-connector to base_libdir
In reply to [email protected]From: Jackie Huang <[email protected]>
move libck-connector.so.* to base_libdir and move pam_ck_connector.la to libdir to kill two warnings:
WARNING: QA Issue: consolekit: /lib64/security/pam_ck_connector.so, installed in the base_prefix, requires a shared library under exec_prefix (/usr): libck-connector.so.0 => /usr/lib64/ libck-connector.so.0 (0x00000000dead300
WARNING: QA Issue: lib32-consolekit: Found a reference to /usr/ in
/buildarea1/jhuang0/t_multilib/p_x64_0217/bitbake_build/tmp/work/
x86-wrsmllib32-linux/lib32-consolekit-0.4.5-r10/packages-split/i lib32-consolekit/lib/security/pam_ck_connector.la
WARNING: QA Issue: Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix
--- .../recipes-support/consolekit/consolekit_0.4.5.bb | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
meta/recipes-support/consolekit/consolekit_0.4.5.bb +13 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" -PR = "r10" +PR = "r11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
@@ -19,6 +19,7 @@ SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3" SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38" +DISTRO_FEATURES += 'pam' S = "${WORKDIR}/ConsoleKit-${PV}" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
@@ -41,4 +42,15 @@ RDEPENDS_pam-plugin-ck-connector += "${PN}" do_install_append() { # Remove /var/run from package as console-kit-daemon will populate it on startup rm -fr "${D}${localstatedir}/run" + # Moving libck-connector to base_libdir + # and moving pam_ck_connector.la to libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libck-connector.so.0* ${D}${base_libdir}/ + rel_lib_prefix=${@os.path.relpath(d.getVar('base_libdir', True), d.getVar('libdir', True))} + ln -sf ${rel_lib_prefix}/libck-connector.so.0.0.0 ${D}${libdir}/libck-connector.so + if [ -f ${D}${base_libdir}/security/pam_ck_connector.la ]; then + mv -f ${D}${base_libdir}/security/pam_ck_connector.la ${D}${libdir}/ + fi + fi }
Signature · 1 line
1.7.4.1