Skip to contentSkip to conversation

ipkg: remove legacy staging and install `libipkg.pc` properly

PATCH Superseded Paul Menzel 3 participants 8 messages Mar 22, 2011

lore
Share & tools
lore
#0 lore raw

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

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

CC Andreas Oberritter <[email protected]>

---
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(-)
recipes/ipkg/ipkg_0.99.163.bb +4 -9
index 8eb83a1..09068d4 100644
@@ -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"
Signature · 1 line
1.7.4.1
#1 lore raw

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

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

CC Andreas Oberritter <[email protected]>

---
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(-)
recipes/ipkg/ipkg_0.99.163.bb +4 -9
index 8eb83a1..f89a274 100644
@@ -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"
Signature · 1 line
1.7.4.1
#2 lore raw

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

CC Andreas Oberritter <[email protected]>

---
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(-)
recipes/ipkg/ipkg_0.99.163.bb +6 -6
index 8eb83a1..01e3629 100644
@@ -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"
Signature · 1 line
1.7.4.1
#3 lore raw
In reply to Paul Menzel
Quoted 7 lines · Paul Menzel

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,

Quoted 50 lines
CC Andreas Oberritter <[email protected]>

---
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(-)
recipes/ipkg/ipkg_0.99.163.bb +4 -9
index 8eb83a1..09068d4 100644
@@ -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"
Signature · 8 lines
1.7.4.1



_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw

Am Dienstag, den 22.03.2011, 11:56 +0100 schrieb Martin Jansa:

Quoted 11 lines · Paul Menzel
Quoted 7 lines

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.

Quoted 1 line

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

Quoted 56 lines
Quoted 50 lines
CC Andreas Oberritter <[email protected]>

---
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(-)
recipes/ipkg/ipkg_0.99.163.bb +4 -9
index 8eb83a1..09068d4 100644
@@ -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"
Signature · 8 lines
1.7.4.1



_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#5 lore raw
Quoted 6 lines · Paul Menzel

Am Dienstag, den 22.03.2011, 11:56 +0100 schrieb Martin Jansa:

Quoted 5 lines · Paul Menzel
Quoted 4 lines

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].

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

[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

Quoted 4 lines
Quoted 1 line

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,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw
In reply to Paul Menzel

Hello Paul,

Quoted 14 lines · Paul Menzel
recipes/ipkg/ipkg_0.99.163.bb +1 -2
@@ -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() {

recipes/ipkg/ipkg_0.99.163.bb SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ · line 18

Quoted 10 lines
recipes/ipkg/ipkg_0.99.163.bb +3 -6
-	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

#7 lore raw

Dear Andreas,

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

Quoted 14 lines · Paul Menzel
Quoted 13 lines
recipes/ipkg/ipkg_0.99.163.bb +1 -1
@@ -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 \
 	"
 
Quoted 15 lines

recipes/ipkg/ipkg_0.99.163.bb SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ · line 18

Quoted 11 lines
recipes/ipkg/ipkg_0.99.163.bb +3 -7
-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.

Quoted 1 line

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