Patchwork consolekit: move libck-connector to base_libdir

login
register
mail settings
Submitter jackie huang
Date June 14, 2013, 7:54 a.m.
Message ID <1371196454-10206-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/51713/
State New
Headers show

Comments

jackie huang - June 14, 2013, 7:54 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

move libck-connector.so.* to base_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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

--
1.7.4.1
Saul Wold - June 14, 2013, 5:19 p.m.
On 06/14/2013 12:54 AM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> move libck-connector.so.* to base_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 |   11 ++++++++++-
>   1 files changed, 10 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..3d976d4 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,13 @@ 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
> +	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
> +	        mkdir -p ${D}/${base_libdir}/
> +	        mv -f ${D}${libdir}/libck-connector.so.0* ${D}${base_libdir}/
> +	        mv -f ${D}${base_libdir}/security/pam_ck_connector.la ${D}${libdir}/
> +	        rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
> +	        ln -sf ${rel_lib_prefix}${base_libdir}/libck-connector.so.0.0.0 ${D}${libdir}/libck-connector.so
> +	fi
> +

Something did not work out right here.

> | make[1]: Leaving directory `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/consolekit/0.4.5-r11/build'
> | mv: cannot stat `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/consolekit/0.4.5-r11/image/lib/security/pam_ck_connector.la': No such file or directory


Sau!

>   }
> --
> 1.7.4.1
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
jackie huang - June 17, 2013, 3:18 a.m.
On 6/15/2013 1:19 AM, Saul Wold wrote:
> On 06/14/2013 12:54 AM, jackie.huang@windriver.com wrote:
>> From: Jackie Huang <jackie.huang@windriver.com>
>>
>> move libck-connector.so.* to base_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 |   11 ++++++++++-
>>   1 files changed, 10 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..3d976d4 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,13 @@ 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
>> +    if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
>> +            mkdir -p ${D}/${base_libdir}/
>> +            mv -f ${D}${libdir}/libck-connector.so.0*
>> ${D}${base_libdir}/
>> +            mv -f ${D}${base_libdir}/security/pam_ck_connector.la
>> ${D}${libdir}/
>> +            rel_lib_prefix=`echo ${libdir} | sed
>> 's,\(^/\|\)[^/][^/]*,..,g'`
>> +            ln -sf
>> ${rel_lib_prefix}${base_libdir}/libck-connector.so.0.0.0
>> ${D}${libdir}/libck-connector.so
>> +    fi
>> +
>
> Something did not work out right here.

It was a bbappend fix in our layer and it worked, I should have tested 
it in poky, sorry about that. I will check it out.

Thanks,
Jackie

>
>> | make[1]: Leaving directory
>> `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/consolekit/0.4.5-r11/build'
>>
>> | mv: cannot stat
>> `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/consolekit/0.4.5-r11/image/lib/security/pam_ck_connector.la':
>> No such file or directory
>
>
> Sau!
>
>>   }
>> --
>> 1.7.4.1
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>

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..3d976d4 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,13 @@  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
+	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+	        mkdir -p ${D}/${base_libdir}/
+	        mv -f ${D}${libdir}/libck-connector.so.0* ${D}${base_libdir}/
+	        mv -f ${D}${base_libdir}/security/pam_ck_connector.la ${D}${libdir}/
+	        rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
+	        ln -sf ${rel_lib_prefix}${base_libdir}/libck-connector.so.0.0.0 ${D}${libdir}/libck-connector.so
+	fi
+
 }