Patchwork [RFC,2/2] pkgconfig: add git version

login
register
mail settings
Submitter Paul Menzel
Date April 22, 2011, 10 p.m.
Message ID <1303509611.4155.111.camel@mattotaupa>
Download mbox | patch
Permalink /patch/2711/
State New, archived
Headers show

Comments

Paul Menzel - April 22, 2011, 10 p.m.
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
Koen Kooi - April 23, 2011, 8:02 a.m.
-----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-----
Paul Menzel - May 15, 2011, 4:24 p.m.
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
Andreas Oberritter - May 16, 2011, 11:45 a.m.
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
Phil Blundell - May 16, 2011, 11:53 a.m.
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.

Patch

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"