Patchwork [1/2] consolekit: move libck-connector to base_libdir

login
register
mail settings
Submitter jackie huang
Date June 20, 2013, 10:36 a.m.
Message ID <226763569aa069ac26b177edf674b1d695016d2c.1371724384.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/52105/
State New
Headers show

Comments

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

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

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../recipes-support/consolekit/consolekit_0.4.5.bb |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
jackie huang - June 20, 2013, 11:03 a.m.
Sorry I accidently sent the not working one, drop it and I will re-send.

Thanks,
Jackie

On 6/20/2013 6:36 PM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> 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
>
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>   .../recipes-support/consolekit/consolekit_0.4.5.bb |   13 ++++++++++++-
>   1 files changed, 12 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
> index 7d66b39..095cb51 100644
> --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
> +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
> @@ -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 \
> @@ -41,4 +41,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}${base_libdir}/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
>   }
>

Patch

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index 7d66b39..095cb51 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
@@ -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 \
@@ -41,4 +41,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}${base_libdir}/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
 }