* [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc`
@ 2011-04-18 13:47 Paul Menzel
2011-04-18 13:50 ` [RFC] [PATCH 2/2] pkgconfig: add git version Paul Menzel
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Paul Menzel @ 2011-04-18 13:47 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4242 bytes --]
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"`.
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
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
diff --git a/recipes/pkgconfig/pkgconfig-0.23.inc b/recipes/pkgconfig/pkgconfig-0.23.inc
new file mode 100644
index 0000000..5f87d28
--- /dev/null
+++ b/recipes/pkgconfig/pkgconfig-0.23.inc
@@ -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.*/
+}
diff --git a/recipes/pkgconfig/pkgconfig-native_0.23.bb b/recipes/pkgconfig/pkgconfig-native_0.23.bb
index f5f44ac..309077a 100644
--- a/recipes/pkgconfig/pkgconfig-native_0.23.bb
+++ b/recipes/pkgconfig/pkgconfig-native_0.23.bb
@@ -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"
diff --git a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
index cbe6b81..4efb7bd 100644
--- a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
+++ b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
@@ -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"
diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc
index 4edad6a..e6fa5f1 100644
--- a/recipes/pkgconfig/pkgconfig.inc
+++ b/recipes/pkgconfig/pkgconfig.inc
@@ -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
}
diff --git a/recipes/pkgconfig/pkgconfig_0.23.bb b/recipes/pkgconfig/pkgconfig_0.23.bb
index 39f7010..3d8fe6c 100644
--- a/recipes/pkgconfig/pkgconfig_0.23.bb
+++ b/recipes/pkgconfig/pkgconfig_0.23.bb
@@ -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"
--
1.7.4.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-18 13:47 [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
@ 2011-04-18 13:50 ` Paul Menzel
2011-04-19 11:31 ` Andreas Oberritter
2011-05-15 16:17 ` [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
2011-05-15 16:20 ` Paul Menzel
2 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-04-18 13:50 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1827 bytes --]
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
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
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
diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
new file mode 100644
index 0000000..9c6d7d1
--- /dev/null
+++ b/recipes/pkgconfig/pkgconfig_git.bb
@@ -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"
--
1.7.4.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-18 13:50 ` [RFC] [PATCH 2/2] pkgconfig: add git version Paul Menzel
@ 2011-04-19 11:31 ` Andreas Oberritter
2011-04-22 21:15 ` Paul Menzel
0 siblings, 1 reply; 12+ messages in thread
From: Andreas Oberritter @ 2011-04-19 11:31 UTC (permalink / raw)
To: openembedded-devel
On 04/18/2011 03:50 PM, Paul Menzel wrote:
> 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
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> 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
>
> diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
> new file mode 100644
> index 0000000..9c6d7d1
> --- /dev/null
> +++ b/recipes/pkgconfig/pkgconfig_git.bb
> @@ -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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-19 11:31 ` Andreas Oberritter
@ 2011-04-22 21:15 ` Paul Menzel
2011-04-22 21:26 ` Koen Kooi
0 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-04-22 21:15 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
[-- Attachment #1: Type: text/plain, Size: 2824 bytes --]
Am Dienstag, den 19.04.2011, 13:31 +0200 schrieb Andreas Oberritter:
> On 04/18/2011 03:50 PM, Paul Menzel wrote:
> > 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
> >
> > Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> > ---
> > 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
> >
> > diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
> > new file mode 100644
> > index 0000000..9c6d7d1
> > --- /dev/null
> > +++ b/recipes/pkgconfig/pkgconfig_git.bb
> > @@ -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?
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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-22 21:15 ` Paul Menzel
@ 2011-04-22 21:26 ` Koen Kooi
2011-04-22 22:00 ` Paul Menzel
0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-04-22 21:26 UTC (permalink / raw)
To: Paul Menzel; +Cc: openembedded-devel
Op 22 apr 2011, om 23:15 heeft Paul Menzel het volgende geschreven:
> Am Dienstag, den 19.04.2011, 13:31 +0200 schrieb Andreas Oberritter:
>> On 04/18/2011 03:50 PM, Paul Menzel wrote:
>>> 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
>>>
>>> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
>>> ---
>>> 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
>>>
>>> diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
>>> new file mode 100644
>>> index 0000000..9c6d7d1
>>> --- /dev/null
>>> +++ b/recipes/pkgconfig/pkgconfig_git.bb
>>> @@ -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?
>
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread* [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-22 21:26 ` Koen Kooi
@ 2011-04-22 22:00 ` Paul Menzel
2011-04-23 8:02 ` Koen Kooi
0 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-04-22 22:00 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1882 bytes --]
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
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
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
diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
new file mode 100644
index 0000000..39a5033
--- /dev/null
+++ b/recipes/pkgconfig/pkgconfig_git.bb
@@ -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"
--
1.7.4.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-22 22:00 ` Paul Menzel
@ 2011-04-23 8:02 ` Koen Kooi
2011-05-15 16:24 ` Paul Menzel
0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-04-23 8:02 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 23-04-11 00:00, Paul Menzel wrote:
> 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
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> 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
>
> diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
> new file mode 100644
> index 0000000..39a5033
> --- /dev/null
> +++ b/recipes/pkgconfig/pkgconfig_git.bb
> @@ -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"
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> 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-----
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-04-23 8:02 ` Koen Kooi
@ 2011-05-15 16:24 ` Paul Menzel
2011-05-16 11:45 ` Andreas Oberritter
0 siblings, 1 reply; 12+ messages in thread
From: Paul Menzel @ 2011-05-15 16:24 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2631 bytes --]
Am Samstag, den 23.04.2011, 10:02 +0200 schrieb Koen Kooi:
> On 23-04-11 00:00, Paul Menzel wrote:
> > 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
> >
> > Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
>
> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
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.
> > ---
> > 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`.
> > ---
> > recipes/pkgconfig/pkgconfig_git.bb | 10 ++++++++++
> > 1 files changed, 10 insertions(+), 0 deletions(-)
> > create mode 100644 recipes/pkgconfig/pkgconfig_git.bb
> >
> > diff --git a/recipes/pkgconfig/pkgconfig_git.bb b/recipes/pkgconfig/pkgconfig_git.bb
> > new file mode 100644
> > index 0000000..39a5033
> > --- /dev/null
> > +++ b/recipes/pkgconfig/pkgconfig_git.bb
> > @@ -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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-05-15 16:24 ` Paul Menzel
@ 2011-05-16 11:45 ` Andreas Oberritter
2011-05-16 11:53 ` Phil Blundell
0 siblings, 1 reply; 12+ messages in thread
From: Andreas Oberritter @ 2011-05-16 11:45 UTC (permalink / raw)
To: openembedded-devel
On 05/15/2011 06:24 PM, Paul Menzel wrote:
> Am Samstag, den 23.04.2011, 10:02 +0200 schrieb Koen Kooi:
>
>> On 23-04-11 00:00, Paul Menzel wrote:
>>> 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
>>>
>>> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
>>
>> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
>
> 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.
>>> +PV = "0.25+0.26"
>>> +PR = "${INC_PR}.0"
>>> +PR_append = "+gitr${SRCPV}"
Regards,
Andreas
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [RFC] [PATCH 2/2] pkgconfig: add git version
2011-05-16 11:45 ` Andreas Oberritter
@ 2011-05-16 11:53 ` Phil Blundell
0 siblings, 0 replies; 12+ messages in thread
From: Phil Blundell @ 2011-05-16 11:53 UTC (permalink / raw)
To: openembedded-devel
On Mon, 2011-05-16 at 13:45 +0200, Andreas Oberritter wrote:
> 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.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc`
2011-04-18 13:47 [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
2011-04-18 13:50 ` [RFC] [PATCH 2/2] pkgconfig: add git version Paul Menzel
@ 2011-05-15 16:17 ` Paul Menzel
2011-05-15 16:20 ` Paul Menzel
2 siblings, 0 replies; 12+ messages in thread
From: Paul Menzel @ 2011-05-15 16:17 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4732 bytes --]
Am Montag, den 18.04.2011, 15:47 +0200 schrieb Paul Menzel:
> 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"`.
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> 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
>
> diff --git a/recipes/pkgconfig/pkgconfig-0.23.inc b/recipes/pkgconfig/pkgconfig-0.23.inc
> new file mode 100644
> index 0000000..5f87d28
> --- /dev/null
> +++ b/recipes/pkgconfig/pkgconfig-0.23.inc
> @@ -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.*/
> +}
> diff --git a/recipes/pkgconfig/pkgconfig-native_0.23.bb b/recipes/pkgconfig/pkgconfig-native_0.23.bb
> index f5f44ac..309077a 100644
> --- a/recipes/pkgconfig/pkgconfig-native_0.23.bb
> +++ b/recipes/pkgconfig/pkgconfig-native_0.23.bb
> @@ -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"
> diff --git a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> index cbe6b81..4efb7bd 100644
> --- a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> +++ b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb
> @@ -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"
> diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc
> index 4edad6a..e6fa5f1 100644
> --- a/recipes/pkgconfig/pkgconfig.inc
> +++ b/recipes/pkgconfig/pkgconfig.inc
> @@ -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
> }
> diff --git a/recipes/pkgconfig/pkgconfig_0.23.bb b/recipes/pkgconfig/pkgconfig_0.23.bb
> index 39f7010..3d8fe6c 100644
> --- a/recipes/pkgconfig/pkgconfig_0.23.bb
> +++ b/recipes/pkgconfig/pkgconfig_0.23.bb
> @@ -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
> 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 --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc`
2011-04-18 13:47 [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
2011-04-18 13:50 ` [RFC] [PATCH 2/2] pkgconfig: add git version Paul Menzel
2011-05-15 16:17 ` [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
@ 2011-05-15 16:20 ` Paul Menzel
2 siblings, 0 replies; 12+ messages in thread
From: Paul Menzel @ 2011-05-15 16:20 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1187 bytes --]
Am Montag, den 18.04.2011, 15:47 +0200 schrieb Paul Menzel:
> 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"`.
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> 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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-05-16 11:56 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-18 13:47 [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
2011-04-18 13:50 ` [RFC] [PATCH 2/2] pkgconfig: add git version Paul Menzel
2011-04-19 11:31 ` Andreas Oberritter
2011-04-22 21:15 ` Paul Menzel
2011-04-22 21:26 ` Koen Kooi
2011-04-22 22:00 ` Paul Menzel
2011-04-23 8:02 ` Koen Kooi
2011-05-15 16:24 ` Paul Menzel
2011-05-16 11:45 ` Andreas Oberritter
2011-05-16 11:53 ` Phil Blundell
2011-05-15 16:17 ` [PATCH 1/2] pkgconfig: refactor to include file `pkgconfig-0.23.inc` Paul Menzel
2011-05-15 16:20 ` Paul Menzel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.