[PATCH 0/1] libpam: QA issue: installed in the base_prefix, requires a shared library under exec_prefix

[PATCH 0/1] libpam: QA issue: installed in the base_prefix, requires a shared library under exec_prefix

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

We added the fix for zlib 1.2.6 and cracklib 2.8.18 as bbappends in our own layer and worked well,
but when they are updated in oe-core, the bbappends became dangling, so if the fix is
accepted in or-core, we don't have to mantain and update the bbappends and clean them up,
thanks!

Also added the author of the fix in CC list.

* Test info:
1) MACHINE=qemux86-64/qemux86/qemuppc
$ bitbake core-image-sato 
$ bitbake libpam

The following changes since commit 654d5816f8ff696d42d72cfb881d5e51330a79b6:

  build-appliance-image: Update to dee77eca39f406f90e60d9c5ef7a66fcc8f57dbf commit (2012-11-21 20:38:47 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib jhuang0/d_zlib_1122_1
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_zlib_1122_1

Jackie Huang (1):
  libpam: QA Issue: installed in the base_prefix, requires a shared
    library under exec_prefix

 meta/recipes-core/zlib/zlib_1.2.7.bb              |   11 +++++++++++
 meta/recipes-extended/cracklib/cracklib_2.8.19.bb |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

-- 
1.7.4

[PATCH 1/1] libpam: QA Issue: installed in the base_prefix, requires a shared library under exec_prefix

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

    Problem Description
    ======================
    WARNING: QA Issue: libpam: /lib/security/pam_cracklib.so,
    installed in the base_prefix, requires a shared library under
    exec_prefix (/usr): libcrack.so.2 => /usr/lib/libcrack.so.2 (0xdead2000)

    WARNING: QA Issue: libpam: /lib/security/pam_cracklib.so,
    installed in the base_prefix, requires a shared library under
    exec_prefix (/usr): libz.so.1 => /usr/lib/libz.so.1 (0xdead3000)

This fix moves and libcrack over to ${base_libdir}, libz.so.* as well (libz.so
and zlib.pc stays in ${libdir}

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-core/zlib/zlib_1.2.7.bb              |   11 +++++++++++
 meta/recipes-extended/cracklib/cracklib_2.8.19.bb |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb
index 803fec3..8994aee 100644
--- a/meta/recipes-core/zlib/zlib_1.2.7.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.7.bb
@@ -6,6 +6,8 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
 
+PR ="r1"
+
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
            file://remove.ldconfig.call.patch \
            "
@@ -22,6 +24,15 @@ do_compile (){
 
 do_install() {
 	oe_runmake DESTDIR=${D} install
+	case ${PN} in
+		zlib-native*)
+			;;
+		*)
+			mkdir -p ${D}/${base_libdir}
+			mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
+			tmp=`readlink ${D}/${libdir}/libz.so`
+			ln -sf ../../${base_libdir}/$tmp ${D}/${libdir}/libz.so
+	esac
 }
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
index 2951396..99b283a 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
 DEPENDS = "zlib"
-PR ="r0"
+PR ="r1"
 
-EXTRA_OECONF = "--without-python"
+EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz"
 
@@ -15,3 +15,8 @@ SRC_URI[md5sum] = "ca0ec168d9c6466612204e8dfb2df8a9"
 SRC_URI[sha256sum] = "7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9"
 
 inherit autotools gettext
+
+FILES_${PN}-dev += "${base_libdir}/libcrack.so ${base_libdir}/libcrack.la"
+FILES_${PN}-dbg += "${base_libdir}/.debug/*"
+
+
-- 
1.7.4