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

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

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]

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>
---
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(-)

diff --git a/recipes/ipkg/ipkg_0.99.163.bb b/recipes/ipkg/ipkg_0.99.163.bb
index 8eb83a1..09068d4 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 ${WORKDIR}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
 }
 
-
 SRC_URI[md5sum] = "0b10ad2924611bccaea8ddf98481a192"
 SRC_URI[sha256sum] = "405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995"
-- 
1.7.4.1

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

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

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1804 bytes --]

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(-)

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"
-- 
1.7.4.1

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] ipkg: remove legacy staging and install `libipkg.pc` properly

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2334 bytes --]

On Tue, Mar 22, 2011 at 11:42:22AM +0100, Paul Menzel wrote:
> 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

Is it worth to update it now when I hope last bits were also converted
to opkg?

git mv to obsolete would be easier to review :).

Cheers,

> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> CC: Andreas Oberritter <obi@opendreambox.org>
> ---
> 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(-)
> 
> diff --git a/recipes/ipkg/ipkg_0.99.163.bb b/recipes/ipkg/ipkg_0.99.163.bb
> index 8eb83a1..09068d4 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 ${WORKDIR}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
>  }
>  
> -
>  SRC_URI[md5sum] = "0b10ad2924611bccaea8ddf98481a192"
>  SRC_URI[sha256sum] = "405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995"
> -- 
> 1.7.4.1



> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] ipkg: remove legacy staging and install `libipkg.pc` properly

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]

Am Dienstag, den 22.03.2011, 11:56 +0100 schrieb Martin Jansa:
> On Tue, Mar 22, 2011 at 11:42:22AM +0100, Paul Menzel wrote:
> > 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
> 
> Is it worth to update it now when I hope last bits were also converted
> to opkg?

`gpe-package` depends on `libipkg`.

> git mv to obsolete would be easier to review :).

Good point, but maybe someone still uses it and can benefit from the
fix.


Thanks,

Paul


> > Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> > CC: Andreas Oberritter <obi@opendreambox.org>
> > ---
> > 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(-)
> > 
> > diff --git a/recipes/ipkg/ipkg_0.99.163.bb b/recipes/ipkg/ipkg_0.99.163.bb
> > index 8eb83a1..09068d4 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 ${WORKDIR}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
> >  }
> >  
> > -
> >  SRC_URI[md5sum] = "0b10ad2924611bccaea8ddf98481a192"
> >  SRC_URI[sha256sum] = "405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995"
> > -- 
> > 1.7.4.1
> 
> 
> 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] ipkg: remove legacy staging and install `libipkg.pc` properly

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]

On Tue, Mar 22, 2011 at 12:01:33PM +0100, Paul Menzel wrote:
> Am Dienstag, den 22.03.2011, 11:56 +0100 schrieb Martin Jansa:
> > On Tue, Mar 22, 2011 at 11:42:22AM +0100, Paul Menzel wrote:
> > > 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
> > 
> > Is it worth to update it now when I hope last bits were also converted
> > to opkg?
> 
> `gpe-package` depends on `libipkg`.

ok, btw ipkg is blacklisted by Angstrom and Kaeilos so fixing
gpe-package looks like better way to me, but I don't use
gpe-package|ipkg

> > git mv to obsolete would be easier to review :).
> 
> Good point, but maybe someone still uses it and can benefit from the
> fix.

On the other hand, moving ipkg to obsolete would show that we're using
opkg by default now more clearly. And ipkg is used only in old stuff or
by accident.

Something like
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=d1c65e9a7d9d5b324095e6c4eb28cf7a58f394e5

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] ipkg: remove legacy staging and install `libipkg.pc` properly

[Andreas Oberritter]

Hello Paul,

On 03/22/2011 11:42 AM, Paul Menzel wrote:
> --- 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 ${WORKDIR}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
>  }

how do the library and headers get installed? Is there a do_install()
inside ipkg.inc? In that case, you should use do_install_append()
instead or move the two new lines to ipkg.inc.

Despite this, I'd prefer moving it to obsolete, too.

Regards,
Andreas

Re: [PATCH 1/3 v3] ipkg: remove legacy staging and install `libipkg.pc` properly

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1984 bytes --]

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}`
v3: install header files as done beforehand by `do_stage()` (also pointed out by Andreas)

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 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/ipkg/ipkg_0.99.163.bb b/recipes/ipkg/ipkg_0.99.163.bb
index 8eb83a1..01e3629 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,15 @@ 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/
+do_install() {
+	install -d ${D}${includedir}/libipkg/
 	for f in *.h
 	do
-		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+		install -m 0644 $f ${D}${includedir}/libipkg/
 	done
+	install -d ${D}${libdir}/pkgconfig
+	install -m 0644 ${S}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
 }
 
-
 SRC_URI[md5sum] = "0b10ad2924611bccaea8ddf98481a192"
 SRC_URI[sha256sum] = "405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995"
-- 
1.7.4.1

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] ipkg: remove legacy staging and install `libipkg.pc` properly

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]

Dear Andreas,


Am Dienstag, den 22.03.2011, 15:58 +0100 schrieb Andreas Oberritter:

> On 03/22/2011 11:42 AM, Paul Menzel wrote:
> > --- 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 ${WORKDIR}/libipkg.pc ${D}${libdir}/pkgconfig/libipkg.pc
> >  }
> 
> how do the library and headers get installed? Is there a do_install()
> inside ipkg.inc? In that case, you should use do_install_append()
> instead or move the two new lines to ipkg.inc.

I thought they were picked up automatically and got confused because I
had not run `bitbake -c clean libipkg` beforehand. I sent a v3 of this
patch.

> Despite this, I'd prefer moving it to obsolete, too.

I propose to push the cleanup and move it to obsolete afterward or
remove it right away. I am adding Florian to CC to let him comment on
`gpe-package`, which depends on `libipkg`.


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]