Skip to contentSkip to conversation

Dexuan: nspr: fix package splitin

PATCH Applied Dexuan Cui 3 participants 4 messages Apr 13, 2012 – Apr 16, 2012

lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

cover Dexuan: nspr: fix package splitin

The following changes since commit f81b0593e74a31cb2d992df0583948ff57e3ed98:

gdbm: Activate -enable-libgdbm-compat and add symlinks to headers in include/gdbm (2012-03-23 17:56:29 +0200)

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

Dexuan Cui (1):
nspr: fix package spliting

 meta/recipes-support/nspr/nspr_4.8.9.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/1 nspr: fix package spliting

Here /usr/lib/lib*.so files are binaries rather than symbol links. We should package them into ${PN} rather than ${PN}-dev, or else, when a package, that rdepends on nspr, is packaged, we get a "non-dev package rdepends on nspr-dev" ERROR.

Signed-off-by Dexuan Cui <[email protected]>
---
 meta/recipes-support/nspr/nspr_4.8.9.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
meta/recipes-support/nspr/nspr_4.8.9.bb +4 -3
index 8b840d9..d3c683c 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4
                     file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
 SECTION = "libs/network"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
            file://remove-rpath-from-tests.patch \

@@ -160,6 +160,7 @@ do_install_append() {
     install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
 }
 
-FILES_${PN} = "${bindir}/*"
-FILES_${PN}-dev += "${libdir}/nspr/tests/*"
+FILES_${PN} = "${bindir}/* ${libdir}/lib*.so"
+FILES_${PN}-dev = "${libdir}/nspr/tests/* ${libdir}/pkgconfig \
+                ${includedir}/* ${datadir}/aclocal/* "
 FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*"
Signature · 1 line
1.7.6
Tested-by on v1 1/1
#2 lore raw

Re: [PATCH 1/1] nspr: fix package spliting

Quoted 4 lines · Dexuan Cui

Here /usr/lib/lib*.so files are binaries rather than symbol links. We should package them into ${PN} rather than ${PN}-dev, or else, when a package, that rdepends on nspr, is packaged, we get a "non-dev package rdepends on nspr-dev" ERROR.

Applied and built for qemux86. Had to bump PR to "r4" to increase past another applied change.

Quoted 1 line
Signed-off-by Dexuan Cui <[email protected]>
Tested-by Darren Hart <[email protected]>
Quoted 27 lines
---
 meta/recipes-support/nspr/nspr_4.8.9.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
meta/recipes-support/nspr/nspr_4.8.9.bb +4 -3
index 8b840d9..d3c683c 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4
                     file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
 SECTION = "libs/network"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
            file://remove-rpath-from-tests.patch \

@@ -160,6 +160,7 @@ do_install_append() {
     install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
 }
 
-FILES_${PN} = "${bindir}/*"
-FILES_${PN}-dev += "${libdir}/nspr/tests/*"
+FILES_${PN} = "${bindir}/* ${libdir}/lib*.so"
+FILES_${PN}-dev = "${libdir}/nspr/tests/* ${libdir}/pkgconfig \
+                ${includedir}/* ${datadir}/aclocal/* "
 FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*"
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
Applied
#3 lore raw
In reply to Dexuan Cui
Quoted 8 lines · Dexuan Cui

The following changes since commit f81b0593e74a31cb2d992df0583948ff57e3ed98:

gdbm: Activate -enable-libgdbm-compat and add symlinks to headers in include/gdbm (2012-03-23 17:56:29 +0200)

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

Quoted 6 lines

Dexuan Cui (1):
nspr: fix package spliting

  meta/recipes-support/nspr/nspr_4.8.9.bb |    7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)

Merged into OE-Core

Thanks
Sau!