From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail1.windriver.com ([147.11.146.13]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Tz2V6-0000P6-0i for openembedded-core@lists.openembedded.org; Sat, 26 Jan 2013 10:56:51 +0100 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r0Q9f1c6009792 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Sat, 26 Jan 2013 01:41:01 -0800 (PST) Received: from Xouyang-Ubuntu-Desktop.eelinux.com (128.224.162.207) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.328.9; Sat, 26 Jan 2013 01:41:00 -0800 From: Xin Ouyang To: , Date: Sat, 26 Jan 2013 17:41:03 +0800 Message-ID: <1359193263-20654-1-git-send-email-Xin.Ouyang@windriver.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Subject: [V3 PATCH] libcgroup: fix the QA issue for pam_cgroup.so* X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2013 09:57:14 -0000 Content-Type: text/plain 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. Acked-by: Ross Burton Signed-off-by: Xin Ouyang --- meta/recipes-core/libcgroup/libcgroup_0.37.1.bb | 16 ++++++++++++++-- 1 file changed, 14 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..b3281d9 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb @@ -23,5 +23,17 @@ 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}/ + rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` + ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so + 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 +} -- 1.7.10.4