[PATCH 0/1][PULL] libpng: fix rootfs error caused by dangling link in libpng package

[PATCH 0/1][PULL] libpng: fix rootfs error caused by dangling link in libpng package

[Dongxiao Xu]

Hi Richard and Saul,

This pull request fixes the libpng dangling link, please help to review and pull.

It should fix the problem of rootfs error that Saul met in multilib build.

Thanks,
Dongxiao

The following changes since commit 6f2ff4f804bb29202d04cf69dcc7da845cda2b2b:

  multilib_global.bbclass: Fix non-multilib package provides (2011-09-20 17:39:15 -0700)

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

Dongxiao Xu (1):
  libpng: avoid dangling link in libpng package

 meta/recipes-multimedia/libpng/libpng_1.2.46.bb |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

[PATCH 1/1] libpng: avoid dangling link in libpng package

[Dongxiao Xu]

As for libpng recipe, the libpng.pc is a symbol link to libpng12.pc,
if packaging them into two different packages, we will get a dangling
link for libpng.pc, and when calculating rpm dependency with that file,
we will get nothing.

Only keep one version of dev package to fix the issue.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/recipes-multimedia/libpng/libpng_1.2.46.bb |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
index 57d9037..0a28709 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \
                     file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc"
 DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
 
@@ -15,11 +15,9 @@ SRC_URI[sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af21
 
 inherit autotools binconfig pkgconfig
 
-PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
+PACKAGES =+ "${PN}12"
 
-FILES_${PN}12-dbg = "${libdir}/.debug/libpng12*"
 FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
-FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
 FILES_${PN} = "${libdir}/lib*${SOLIBS}"
 FILES_${PN}-dev += " ${bindir} ${sbindir}"
 
-- 
1.7.1