Patchwork [1/3,v2] ipkg: remove legacy staging and install `libipkg.pc` properly

login
register
mail settings
Submitter Paul Menzel
Date March 22, 2011, 10:49 a.m.
Message ID <1300790972.3827.21.camel@mattotaupa>
Download mbox | patch
Permalink /patch/1675/
State New, archived
Headers show

Comments

Paul Menzel - March 22, 2011, 10:49 a.m.
Date: Tue, 22 Mar 2011 10:51:47 +0100

Convert to new style staging [1] and install `libipkg.pc` properly as done in [2][3].

[1] http://openembedded.org/index.php/Legacy_staging
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=c2c8fe4c5629add94bd0b922f5b3446624a9f4d8
[3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=48838f0fca6b00767115dd13bce2537f035fd3ba

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
CC: Andreas Oberritter <obi@opendreambox.org>
---
v2: use correct location `${S}` instead of `${WORKDIR}`

Another time I do not understand why `libipkg.pc` is not installed
automatically. I did not find »libipkg.pc was not installed.« from
`pkgconfig.bbclass` in `log.do_install`. Is that an error in the
Makefile of `ipkg`?
---
 recipes/ipkg/ipkg_0.99.163.bb |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

Patch

diff --git a/recipes/ipkg/ipkg_0.99.163.bb b/recipes/ipkg/ipkg_0.99.163.bb
index 8eb83a1..f89a274 100644
--- a/recipes/ipkg/ipkg_0.99.163.bb
+++ b/recipes/ipkg/ipkg_0.99.163.bb
@@ -1,5 +1,5 @@ 
 include ipkg.inc
-PR = "r8"
+PR = "r9"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
@@ -12,15 +12,10 @@  SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
 	file://lonk-link-name.patch \
 	"
 
-do_stage() {
-	oe_libinstall -so libipkg ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libipkg/
-	for f in *.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
-	done
+do_install () {
+	install -d ${D}${libdir}/pkgconfig
+	install -m 0644 ${S}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
 }
 
-
 SRC_URI[md5sum] = "0b10ad2924611bccaea8ddf98481a192"
 SRC_URI[sha256sum] = "405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995"