Re: [V2 PATCH] libcgroup: fix the QA issue for pam_cgroup.so*

[Pascal Ouyang <xin.ouyang@windriver.com>]

于 2013年01月24日 19:25, Xin Ouyang 写道:
> PAM modules in ${base_libdir}/security/ should be binary .so files,
> not symlinks, so fix this. Since pam_cgroup.so is installed into
> ${base_libdir}/security, move libcgroup.so.* to ${base_libdir} to
> avoid "unsafe-references-in-binaries" QA issue.
>
> Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
> ---
>   meta/recipes-core/libcgroup/libcgroup_0.37.1.bb |   15 +++++++++++++--
>   1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
> index e74f831..d217f7b 100644
> --- a/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
> +++ b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
> @@ -23,5 +23,16 @@ FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*"
>   FILES_${PN}-dbg += "${base_libdir}/security/.debug"
>   FILES_${PN}-dev += "${base_libdir}/security/*.la"
>
> -# We really need the symlink so :(
> -INSANE_SKIP_cgroups-pam-plugin = "dev-so"
> +do_install_append() {
> +	# Moving libcgroup to base_libdir
> +	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
> +		mkdir -p ${D}/${base_libdir}/
> +		mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/
> +		ln -sf ${D}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so

I should not use absolute path for this symlink here.

rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 \
        ${D}${libdir}/libcgroup.so

V3 will be sent. Thanks.

- Pascal

> +	fi
> +	# pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks.
> +	if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then
> +		mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so
> +		rm -f ${D}${base_libdir}/security/pam_cgroup.so.*
> +	fi
> +}
>