Skip to contentSkip to conversation

pkgconfig: refactor to include file `pkgconfig-0.23.inc`

PATCH In review Paul Menzel 4 participants 12 messages Apr 18, 2011 – May 16, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pkgconfig: refactor to include file `pkgconfig-0.23.inc`

Date: Sun, 17 Apr 2011 22:44:04 +0200

In pkg-config releases after 0.23 no patches need to be applied and OE defaults can be used. Since pkgconfig-{native,sdk} also need the common bits factor those out into pkgconfig-0.23.inc.

This patch is build tested using angstrom-2010.x and minimal{,-uclibc} for MACHINE = "beagleboard".

---
 recipes/pkgconfig/pkgconfig-0.23.inc       |   14 ++++++++++++++
 recipes/pkgconfig/pkgconfig-native_0.23.bb |    6 +-----
 recipes/pkgconfig/pkgconfig-sdk_0.23.bb    |    6 +-----
 recipes/pkgconfig/pkgconfig.inc            |   11 +++--------
 recipes/pkgconfig/pkgconfig_0.23.bb        |    7 ++-----
 5 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig-0.23.inc
recipes/pkgconfig/pkgconfig-0.23.inc new file +14 -0
new file mode 100644
index 0000000..5f87d28
@@ -0,0 +1,14 @@
+require pkgconfig.inc
+
+SRC_URI += " \
+            file://autofoo.patch \
+            file://sysrootfix.patch \
+            file://glibconfig-sysdefs.h \
+           "
+SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
+SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
+
+acpaths = "-I ."
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/
+}
recipes/pkgconfig/pkgconfig-native_0.23.bb +1 -5
index f5f44ac..309077a 100644
@@ -1,11 +1,7 @@
-require pkgconfig.inc
+require pkgconfig-0.23.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 PR = "${INC_PR}.1"
 
-S = "${WORKDIR}/pkg-config-${PV}/"
 inherit native
 DEPENDS = ""
-
-SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
-SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
recipes/pkgconfig/pkgconfig-sdk_0.23.bb +1 -5
index cbe6b81..4efb7bd 100644
@@ -1,11 +1,7 @@
-require pkgconfig.inc
+require pkgconfig-0.23.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 PR = "${INC_PR}.1"
 
-S = "${WORKDIR}/pkg-config-${PV}/"
 inherit sdk
 DEPENDS = ""
-
-SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
-SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
recipes/pkgconfig/pkgconfig.inc +3 -8
index 4edad6a..e6fa5f1 100644
@@ -5,22 +5,17 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
 LICENSE = "GPLv2+"
+DEPENDS = "glib-2.0"
 INC_PR = "r8"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://autofoo.patch \
-           file://sysrootfix.patch \
-           file://glibconfig-sysdefs.h"
+          "
 
+# Setting `S` is needed, since the recipe name is `pkgconfig` instead of `pkg-config`.
 S = "${WORKDIR}/pkg-config-${PV}/"
 
 inherit autotools
 
-acpaths = "-I ."
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/
-}
-
 do_install_append() {
 	install -d -m 0755 ${D}${libdir}/pkgconfig
 }
recipes/pkgconfig/pkgconfig_0.23.bb +2 -5
index 39f7010..3d8fe6c 100644
@@ -1,9 +1,6 @@
-require pkgconfig.inc
+require ${PN}.inc
+require ${P}.inc
 
 PR = "${INC_PR}.3"
 
-DEPENDS += "glib-2.0"
 EXTRA_OECONF = "--with-installed-glib"
-
-SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
-SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
Signature · 1 line
1.7.4.4
#1 lore raw

RFC PATCH 2/2 pkgconfig: add git version

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

---
1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?

---
 recipes/pkgconfig/pkgconfig_git.bb |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
recipes/pkgconfig/pkgconfig_git.bb new file +12 -0
new file mode 100644
index 0000000..9c6d7d1
@@ -0,0 +1,12 @@
+require ${PN}.inc
+
+PR = "${INC_PR}.0"
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+PV = "0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"
+
+S = "${WORKDIR}/git"
Signature · 1 line
1.7.4.4
#2 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

Quoted 40 lines · Paul Menzel

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

---
1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?

---
 recipes/pkgconfig/pkgconfig_git.bb |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
recipes/pkgconfig/pkgconfig_git.bb new file +0 -0
new file mode 100644
index 0000000..9c6d7d1

recipes/pkgconfig/pkgconfig_git.bb line 10

Quoted 10 lines
recipes/pkgconfig/pkgconfig_git.bb new file +10 -0
@@ -0,0 +1,12 @@
+require ${PN}.inc
+
+PR = "${INC_PR}.0"
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+PV = "0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"

Usually, SRCPV is used in PV, not PR. Also, I'd prefer not using 0.26 for a pre-release snapshot, to make a future update to the released version work. How about using one of

PV = "0.25+gitr${SRCPV}"

or

PV = "0.25.999+gitr${SRCPV}"

instead, and removing the PR_append line?

Regards,
Andreas

#3 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

Am Dienstag, den 19.04.2011, 13:31 +0200 schrieb Andreas Oberritter:

Quoted 56 lines · Paul Menzel
Quoted 40 lines

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

---
1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?

---
 recipes/pkgconfig/pkgconfig_git.bb |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
recipes/pkgconfig/pkgconfig_git.bb new file +0 -0
new file mode 100644
index 0000000..9c6d7d1

recipes/pkgconfig/pkgconfig_git.bb line 10

Quoted 10 lines
recipes/pkgconfig/pkgconfig_git.bb new file +10 -0
@@ -0,0 +1,12 @@
+require ${PN}.inc
+
+PR = "${INC_PR}.0"
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+PV = "0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"

Usually, SRCPV is used in PV, not PR. Also, I'd prefer not using 0.26 for a pre-release snapshot, to make a future update to the released version work. How about using one of

Quoted 7 lines

PV = "0.25+gitr${SRCPV}"

or

PV = "0.25.999+gitr${SRCPV}"

instead, and removing the PR_append line?

Your suggestion is documented in the user manual [1], but Koen advised to use PR_append to keep the hash out of PV [2].

Would I get an Acked-by changing the line to the following?

	PV = "0.25+0.26"

Thanks,

Paul

[1] http://docs.openembedded.org/usermanual/usermanual.html#commonuse_new_package
[2] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-January/028803.html

#4 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

Op 22 apr 2011, om 23:15 heeft Paul Menzel het volgende geschreven:

Quoted 63 lines

Am Dienstag, den 19.04.2011, 13:31 +0200 schrieb Andreas Oberritter:

Quoted 62 lines · Paul Menzel
Quoted 40 lines

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

---
1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?
---
recipes/pkgconfig/pkgconfig_git.bb | 12 ++++++++++++

1 files changed, 12 insertions(+), 0 deletions(-)

create mode 100644 recipes/pkgconfig/pkgconfig_git.bb

recipes/pkgconfig/pkgconfig_git.bb new file +0 -0
new file mode 100644
index 0000000..9c6d7d1

recipes/pkgconfig/pkgconfig_git.bb line 10

Quoted 10 lines
recipes/pkgconfig/pkgconfig_git.bb new file +10 -0
@@ -0,0 +1,12 @@
+require ${PN}.inc
+
+PR = "${INC_PR}.0"
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+PV = "0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"

Usually, SRCPV is used in PV, not PR. Also, I'd prefer not using 0.26 for a pre-release snapshot, to make a future update to the released version work. How about using one of

PV = "0.25+gitr${SRCPV}"

or

PV = "0.25.999+gitr${SRCPV}"

Quoted 8 lines
Quoted 1 line

instead, and removing the PR_append line?

Your suggestion is documented in the user manual [1], but Koen advised to use PR_append to keep the hash out of PV [2].

Would I get an Acked-by changing the line to the following?

	PV = "0.25+0.26"

You would from me

#5 lore raw

RFC PATCH 2/2 pkgconfig: add git version

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

---
v2: change PV from 0.26 to 0.25+0.26 to ensure a sane upgrade path

1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?

---
 recipes/pkgconfig/pkgconfig_git.bb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
recipes/pkgconfig/pkgconfig_git.bb new file +10 -0
new file mode 100644
index 0000000..39a5033
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+PV = "0.25+0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+S = "${WORKDIR}/git"
Signature · 1 line
1.7.4.4
Acked-by on v1 2/2
#6 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 19 lines · Paul Menzel

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

Quoted 7 lines

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

Quoted 29 lines

---
v2: change PV from 0.26 to 0.25+0.26 to ensure a sane upgrade path

1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?

---
 recipes/pkgconfig/pkgconfig_git.bb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
recipes/pkgconfig/pkgconfig_git.bb new file +10 -0
new file mode 100644
index 0000000..39a5033
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+PV = "0.25+0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+S = "${WORKDIR}/git"
Quoted 4 lines

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNsoeSMkyGM64RGpERAveXAKC3iP++G8EZfKoge8kxx2oWr6aYNACeIPIf UAEnH0MfXgLlRJrGE5FtN00=
=hiyJ
-----END PGP SIGNATURE-----

#7 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

Am Samstag, den 23.04.2011, 10:02 +0200 schrieb Koen Kooi:

Quoted 22 lines · Paul Menzel
Quoted 21 lines

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

Quoted 7 lines
Quoted 5 lines

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

I did not commit this yet thinking Andreas would give his ack. Today pkg-config 0.26 was released. I am testing this right now and will update the revision accordingly.

Quoted 5 lines
Quoted 5 lines

---
v2: change PV from 0.26 to 0.25+0.26 to ensure a sane upgrade path

1. How can this recipe used also for the native recipe?
2. What is pkg-config-sdk used for?

I am still do not know what to do about pkg-config-native (add BBCLASSEXTEND = "native"?) and pkg-config-sdk.

Quoted 5 lines
Quoted 5 lines
---
 recipes/pkgconfig/pkgconfig_git.bb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
Quoted 16 lines
Quoted 6 lines
recipes/pkgconfig/pkgconfig_git.bb new file +0 -0
new file mode 100644
index 0000000..39a5033

recipes/pkgconfig/pkgconfig_git.bb line 10

Quoted 10 lines
recipes/pkgconfig/pkgconfig_git.bb new file +10 -0
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+SRCREV = "7850aeb03a54a15d07b6c243b61033cd379c39d7"
+PV = "0.25+0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/pkg-config;protocol=git"
+
+S = "${WORKDIR}/git"

Thanks,

Paul

[1] http://lists.freedesktop.org/archives/pkg-config/2011-May/000744.html

#8 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

Quoted 28 lines · Paul Menzel

Am Samstag, den 23.04.2011, 10:02 +0200 schrieb Koen Kooi:

Quoted 26 lines · Paul Menzel
Quoted 25 lines

Date: Sun, 17 Apr 2011 19:19:58 +0200

1. The revision is close to the upcoming release of pkg-config 0.26. [1]
2. The patch sysrootfix.patch has been merged upstream [2].
3. No embedded GLib is shipped anymore [3]. Therefore drop patches autofoo.patch and glibconfig-sysdefs.h.

The patch is tested using the following configuration

Build Configuration:
BB_VERSION = "1.12.0"
METADATA_BRANCH = "pkg-config"
METADATA_REVISION = "d4ae0c5"
TARGET_ARCH = "arm"
TARGET_OS = "linux-uclibceabi"
MACHINE = "beagleboard"
DISTRO = "minimal-uclibc"
DISTRO_VERSION = "dev-snapshot-20110417"
TARGET_FPU = "hard"

and angstrom-2010.x and minimal too.

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000720.html
[2] http://cgit.freedesktop.org/pkg-config/commit/?id=66d49f1375fec838bcd301bb4ca2ef76cee0e47c
[3] http://cgit.freedesktop.org/pkg-config/commit/?id=99964eddb5935173fcedfc793e762d7dc7d01bba

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

I did not commit this yet thinking Andreas would give his ack.

I still think that using SRCPV in PR is just wrong. SRCPV doesn't change the version of the package but the version of the packaged content. Otherwise it would be called SRCPR.

Quoted 3 lines
Quoted 3 lines

recipes/pkgconfig/pkgconfig_git.bb line 6

Quoted 3 lines
recipes/pkgconfig/pkgconfig_git.bb new file +3 -0
+PV = "0.25+0.26"
+PR = "${INC_PR}.0"
+PR_append = "+gitr${SRCPV}"

Regards,
Andreas

#9 lore raw

Re: [RFC] [PATCH 2/2] pkgconfig: add git version

Quoted 3 lines · Andreas Oberritter

I still think that using SRCPV in PR is just wrong. SRCPV doesn't change the version of the package but the version of the packaged content. Otherwise it would be called SRCPR.

Agreed. If you want SRCPV anywhere (and it's not entirely obvious that all distros would want it at all), it seems like it should go in either PV, PKGV, the DESCRIPTION, or some custom output field. Jamming it into ${PR} from the recipe does seem, as you say, "just wrong".

See also gitpkgv.bbclass which has some further words about this stuff.

p.

#10 lore raw
In reply to Paul Menzel

Am Montag, den 18.04.2011, 15:47 +0200 schrieb Paul Menzel:

Quoted 122 lines

Date: Sun, 17 Apr 2011 22:44:04 +0200

In pkg-config releases after 0.23 no patches need to be applied and OE defaults can be used. Since pkgconfig-{native,sdk} also need the common bits factor those out into pkgconfig-0.23.inc.

This patch is build tested using angstrom-2010.x and minimal{,-uclibc} for MACHINE = "beagleboard".

---
 recipes/pkgconfig/pkgconfig-0.23.inc       |   14 ++++++++++++++
 recipes/pkgconfig/pkgconfig-native_0.23.bb |    6 +-----
 recipes/pkgconfig/pkgconfig-sdk_0.23.bb    |    6 +-----
 recipes/pkgconfig/pkgconfig.inc            |   11 +++--------
 recipes/pkgconfig/pkgconfig_0.23.bb        |    7 ++-----
 5 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig-0.23.inc
recipes/pkgconfig/pkgconfig-0.23.inc new file +14 -0
new file mode 100644
index 0000000..5f87d28
@@ -0,0 +1,14 @@
+require pkgconfig.inc
+
+SRC_URI += " \
+            file://autofoo.patch \
+            file://sysrootfix.patch \
+            file://glibconfig-sysdefs.h \
+           "
+SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
+SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
+
+acpaths = "-I ."
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/
+}
recipes/pkgconfig/pkgconfig-native_0.23.bb +1 -5
index f5f44ac..309077a 100644
@@ -1,11 +1,7 @@
-require pkgconfig.inc
+require pkgconfig-0.23.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 PR = "${INC_PR}.1"
 
-S = "${WORKDIR}/pkg-config-${PV}/"
 inherit native
 DEPENDS = ""
-
-SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
-SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
recipes/pkgconfig/pkgconfig-sdk_0.23.bb +1 -5
index cbe6b81..4efb7bd 100644
@@ -1,11 +1,7 @@
-require pkgconfig.inc
+require pkgconfig-0.23.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 PR = "${INC_PR}.1"
 
-S = "${WORKDIR}/pkg-config-${PV}/"
 inherit sdk
 DEPENDS = ""
-
-SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
-SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"
recipes/pkgconfig/pkgconfig.inc +3 -8
index 4edad6a..e6fa5f1 100644
@@ -5,22 +5,17 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
 LICENSE = "GPLv2+"
+DEPENDS = "glib-2.0"
 INC_PR = "r8"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://autofoo.patch \
-           file://sysrootfix.patch \
-           file://glibconfig-sysdefs.h"
+          "
 
+# Setting `S` is needed, since the recipe name is `pkgconfig` instead of `pkg-config`.
 S = "${WORKDIR}/pkg-config-${PV}/"
 
 inherit autotools
 
-acpaths = "-I ."
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/
-}
-
 do_install_append() {
 	install -d -m 0755 ${D}${libdir}/pkgconfig
 }
recipes/pkgconfig/pkgconfig_0.23.bb +2 -5
index 39f7010..3d8fe6c 100644
@@ -1,9 +1,6 @@
-require pkgconfig.inc
+require ${PN}.inc
+require ${P}.inc
 
 PR = "${INC_PR}.3"
 
-DEPENDS += "glib-2.0"
 EXTRA_OECONF = "--with-installed-glib"
-
-SRC_URI[md5sum] = "d922a88782b64441d06547632fd85744"
-SRC_URI[sha256sum] = "08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53"

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

#11 lore raw
In reply to Paul Menzel

Am Montag, den 18.04.2011, 15:47 +0200 schrieb Paul Menzel:

Quoted 7 lines

Date: Sun, 17 Apr 2011 22:44:04 +0200

In pkg-config releases after 0.23 no patches need to be applied and OE defaults can be used. Since pkgconfig-{native,sdk} also need the common bits factor those out into pkgconfig-0.23.inc.

This patch is build tested using angstrom-2010.x and minimal{,-uclibc} for MACHINE = "beagleboard".

Quoted 8 lines
---
 recipes/pkgconfig/pkgconfig-0.23.inc       |   14 ++++++++++++++
 recipes/pkgconfig/pkgconfig-native_0.23.bb |    6 +-----
 recipes/pkgconfig/pkgconfig-sdk_0.23.bb    |    6 +-----
 recipes/pkgconfig/pkgconfig.inc            |   11 +++--------
 recipes/pkgconfig/pkgconfig_0.23.bb        |    7 ++-----
 5 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 recipes/pkgconfig/pkgconfig-0.23.inc

[…]

I committed this in 34cb3c31 so that others maybe trying to package the just released pkg-config 0.26 can use it.

Thanks,

Paul

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=34cb3c31bfd81035870a8242850884edac80aa11