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

login
register
mail settings
Submitter Paul Menzel
Date April 18, 2011, 1:50 p.m.
Message ID <1303134640.3910.67.camel@mattotaupa>
Download mbox | patch
Permalink /patch/2491/
State New, archived
Headers show

Comments

Paul Menzel - April 18, 2011, 1:50 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>
---
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
Andreas Oberritter - April 19, 2011, 11:31 a.m.
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
Paul Menzel - April 22, 2011, 9:15 p.m.
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
Koen Kooi - April 22, 2011, 9:26 p.m.
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

Patch

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"