[PATCH 0/4] Pull request

[PATCH 0/4] Pull request

[Martin Jansa]

First two patches are taken from previous pull request 
(without rejected distutils-common-base.bbclass: Prepend STAGING_LIBDIR to linker library search path.)
Other two allows distro layer to be a bit smaller.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: jansa/pull
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Thanks,
    Martin Jansa <Martin.Jansa@gmail.com>
---


Martin Jansa (4):
  gconf-dbus: add SRCREV to recipe
  xf86-video-omapfb: add SRCREV to recipe
  task-base: allow distribution to define apm provider
  python-dir.bbclass: define default PYTHON_BASEVERSION

 meta/classes/python-dir.bbclass                    |    1 +
 meta/recipes-core/tasks/task-base.bb               |    5 ++++-
 meta/recipes-gnome/gnome/gconf-dbus_svn.bb         |    1 +
 .../xorg-driver/xf86-video-omapfb_git.bb           |    1 +
 4 files changed, 7 insertions(+), 1 deletions(-)

-- 
1.7.5.rc1

[PATCH 1/4] gconf-dbus: add SRCREV to recipe

[Martin Jansa]

* taken from meta/conf/distro/include/poky-default-revisions.inc for
  those who want gconf-dbus and are not using poky

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-gnome/gnome/gconf-dbus_svn.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
index 9fdd82c..04908c3 100644
--- a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
+++ b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb
@@ -10,6 +10,7 @@ RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCPV}"
 
+SRCREV = "705"
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
 
-- 
1.7.5.rc1

[PATCH 2/4] xf86-video-omapfb: add SRCREV to recipe

[Martin Jansa]

* taken from meta/conf/distro/include/poky-default-revisions.inc for
  those who want xf86-video-omapfb and are not using poky

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xorg-driver/xf86-video-omapfb_git.bb           |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 2714786..5281665 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -13,6 +13,7 @@ PE = "1"
 PR = "r1"
 PV = "0.1.1+git${SRCPV}"
 
+SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
             file://omap-revert-set-CRTC-limit.patch \
             file://omap-revert-set-virtual-size.patch \
-- 
1.7.5.rc1

Re: [PATCH 2/4] xf86-video-omapfb: add SRCREV to recipe

[Koen Kooi]

Op 18 apr 2011, om 10:00 heeft Martin Jansa het volgende geschreven:

> * taken from meta/conf/distro/include/poky-default-revisions.inc for
>  those who want xf86-video-omapfb and are not using poky

Use the one in meta-oe :)

> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../xorg-driver/xf86-video-omapfb_git.bb           |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> index 2714786..5281665 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> @@ -13,6 +13,7 @@ PE = "1"
> PR = "r1"
> PV = "0.1.1+git${SRCPV}"
> 
> +SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
> SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
>             file://omap-revert-set-CRTC-limit.patch \
>             file://omap-revert-set-virtual-size.patch \
> -- 
> 1.7.5.rc1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 2/4] xf86-video-omapfb: add SRCREV to recipe

[Martin Jansa]

On Mon, Apr 18, 2011 at 10:03:05AM +0200, Koen Kooi wrote:
> 
> Op 18 apr 2011, om 10:00 heeft Martin Jansa het volgende geschreven:
> 
> > * taken from meta/conf/distro/include/poky-default-revisions.inc for
> >  those who want xf86-video-omapfb and are not using poky
> 
> Use the one in meta-oe :)

Koen: I do, just got this recipe once and wanted to make it usable. Not all
people using oe-core use poky as distro or their include files.

RP: Is there any problem with those 2 SRCREV patches? I've sent both twice
already.

Koen's advertiesment of meta-oe version is not reason to ignore oe-core
recipe I guess..

> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > .../xorg-driver/xf86-video-omapfb_git.bb           |    1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> > index 2714786..5281665 100644
> > --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
> > @@ -13,6 +13,7 @@ PE = "1"
> > PR = "r1"
> > PV = "0.1.1+git${SRCPV}"
> > 
> > +SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
> > SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
> >             file://omap-revert-set-CRTC-limit.patch \
> >             file://omap-revert-set-virtual-size.patch \
> > -- 
> > 1.7.5.rc1

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[PATCH 3/4] task-base: allow distribution to define apm provider

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/tasks/task-base.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 138e617..10f3af4 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
     acpid \
     libacpi "
 
+# Distro can override apm provider
+DISTRO_APM ?= "apm"
+
 RDEPENDS_task-base-apm = "\
-    apm \
+    ${DISTRO_APM} \
     apmd"
 
 RDEPENDS_task-base-ext2 = "\
-- 
1.7.5.rc1

Re: [PATCH 3/4] task-base: allow distribution to define apm provider

[Richard Purdie]

On Mon, 2011-04-18 at 10:00 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-core/tasks/task-base.bb |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
> index 138e617..10f3af4 100644
> --- a/meta/recipes-core/tasks/task-base.bb
> +++ b/meta/recipes-core/tasks/task-base.bb
> @@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
>      acpid \
>      libacpi "
>  
> +# Distro can override apm provider
> +DISTRO_APM ?= "apm"
> +
>  RDEPENDS_task-base-apm = "\
> -    apm \
> +    ${DISTRO_APM} \
>      apmd"

Can you explain a little more about why a distro would do this please?
I'm a little worried this whole file could become a set of DISTRO_*
variables :/.

Cheers,

Richard

Re: [PATCH 3/4] task-base: allow distribution to define apm provider

[Martin Jansa]

On Mon, Apr 18, 2011 at 09:34:55AM +0100, Richard Purdie wrote:
> On Mon, 2011-04-18 at 10:00 +0200, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-core/tasks/task-base.bb |    5 ++++-
> >  1 files changed, 4 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
> > index 138e617..10f3af4 100644
> > --- a/meta/recipes-core/tasks/task-base.bb
> > +++ b/meta/recipes-core/tasks/task-base.bb
> > @@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
> >      acpid \
> >      libacpi "
> >  
> > +# Distro can override apm provider
> > +DISTRO_APM ?= "apm"
> > +
> >  RDEPENDS_task-base-apm = "\
> > -    apm \
> > +    ${DISTRO_APM} \
> >      apmd"
> 
> Can you explain a little more about why a distro would do this please?
> I'm a little worried this whole file could become a set of DISTRO_*
> variables :/.
> 
> Cheers,
> 
> Richard

For example in SHR we're using FSO which provides apm replacement called fso-apm which 
conflicts with standard apm.

We can rename it to VIRTUAL-RUNTIME_apm (like
VIRTUAL-RUNTIME_update-alternatives) if you prefer such namespace.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [PATCH 3/4] task-base: allow distribution to define apm provider

[Khem Raj]

On Mon, Apr 18, 2011 at 1:45 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Apr 18, 2011 at 09:34:55AM +0100, Richard Purdie wrote:
>> On Mon, 2011-04-18 at 10:00 +0200, Martin Jansa wrote:
>> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> > ---
>> >  meta/recipes-core/tasks/task-base.bb |    5 ++++-
>> >  1 files changed, 4 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
>> > index 138e617..10f3af4 100644
>> > --- a/meta/recipes-core/tasks/task-base.bb
>> > +++ b/meta/recipes-core/tasks/task-base.bb
>> > @@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
>> >      acpid \
>> >      libacpi "
>> >
>> > +# Distro can override apm provider
>> > +DISTRO_APM ?= "apm"
>> > +
>> >  RDEPENDS_task-base-apm = "\
>> > -    apm \
>> > +    ${DISTRO_APM} \
>> >      apmd"
>>
>> Can you explain a little more about why a distro would do this please?
>> I'm a little worried this whole file could become a set of DISTRO_*
>> variables :/.
>>

may be define virtual/apm package and use that in RDEPENDS

>> Cheers,
>>
>> Richard
>
> For example in SHR we're using FSO which provides apm replacement called fso-apm which
> conflicts with standard apm.
>
> We can rename it to VIRTUAL-RUNTIME_apm (like
> VIRTUAL-RUNTIME_update-alternatives) if you prefer such namespace.
>
> Cheers,
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 3/4] task-base: allow distribution to define apm provider

[Koen Kooi]

Op 27 apr 2011, om 22:08 heeft Khem Raj het volgende geschreven:

> On Mon, Apr 18, 2011 at 1:45 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Mon, Apr 18, 2011 at 09:34:55AM +0100, Richard Purdie wrote:
>>> On Mon, 2011-04-18 at 10:00 +0200, Martin Jansa wrote:
>>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>>> ---
>>>>  meta/recipes-core/tasks/task-base.bb |    5 ++++-
>>>>  1 files changed, 4 insertions(+), 1 deletions(-)
>>>> 
>>>> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
>>>> index 138e617..10f3af4 100644
>>>> --- a/meta/recipes-core/tasks/task-base.bb
>>>> +++ b/meta/recipes-core/tasks/task-base.bb
>>>> @@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
>>>>      acpid \
>>>>      libacpi "
>>>> 
>>>> +# Distro can override apm provider
>>>> +DISTRO_APM ?= "apm"
>>>> +
>>>>  RDEPENDS_task-base-apm = "\
>>>> -    apm \
>>>> +    ${DISTRO_APM} \
>>>>      apmd"
>>> 
>>> Can you explain a little more about why a distro would do this please?
>>> I'm a little worried this whole file could become a set of DISTRO_*
>>> variables :/.
>>> 
> 
> may be define virtual/apm package and use that in RDEPENDS

runtime virtuals are a *bad* *bad* idea. At least opkg has no way of handling those.

regards,

Koen

Re: [PATCH 3/4] task-base: allow distribution to define apm provider

[Khem Raj]

On Wed, Apr 27, 2011 at 1:46 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> Op 27 apr 2011, om 22:08 heeft Khem Raj het volgende geschreven:
>
>> On Mon, Apr 18, 2011 at 1:45 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>> On Mon, Apr 18, 2011 at 09:34:55AM +0100, Richard Purdie wrote:
>>>> On Mon, 2011-04-18 at 10:00 +0200, Martin Jansa wrote:
>>>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>>>> ---
>>>>>  meta/recipes-core/tasks/task-base.bb |    5 ++++-
>>>>>  1 files changed, 4 insertions(+), 1 deletions(-)
>>>>>
>>>>> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
>>>>> index 138e617..10f3af4 100644
>>>>> --- a/meta/recipes-core/tasks/task-base.bb
>>>>> +++ b/meta/recipes-core/tasks/task-base.bb
>>>>> @@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\
>>>>>      acpid \
>>>>>      libacpi "
>>>>>
>>>>> +# Distro can override apm provider
>>>>> +DISTRO_APM ?= "apm"
>>>>> +
>>>>>  RDEPENDS_task-base-apm = "\
>>>>> -    apm \
>>>>> +    ${DISTRO_APM} \
>>>>>      apmd"
>>>>
>>>> Can you explain a little more about why a distro would do this please?
>>>> I'm a little worried this whole file could become a set of DISTRO_*
>>>> variables :/.
>>>>
>>
>> may be define virtual/apm package and use that in RDEPENDS
>
> runtime virtuals are a *bad* *bad* idea. At least opkg has no way of handling those.
>

hmm my suggestion was meant for DEPENDS if possible :) not runtime

> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[PATCH 4/4] python-dir.bbclass: define default PYTHON_BASEVERSION

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/python-dir.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass
index a072a93..1ceb929 100644
--- a/meta/classes/python-dir.bbclass
+++ b/meta/classes/python-dir.bbclass
@@ -1,2 +1,3 @@
+PYTHON_BASEVERSION ?= "2.6"
 PYTHON_DIR = "python${PYTHON_BASEVERSION}"
 PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
-- 
1.7.5.rc1

Re: [PATCH 4/4] python-dir.bbclass: define default PYTHON_BASEVERSION

[Richard Purdie]

On Mon, 2011-04-18 at 10:00 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/python-dir.bbclass |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass
> index a072a93..1ceb929 100644
> --- a/meta/classes/python-dir.bbclass
> +++ b/meta/classes/python-dir.bbclass
> @@ -1,2 +1,3 @@
> +PYTHON_BASEVERSION ?= "2.6"
>  PYTHON_DIR = "python${PYTHON_BASEVERSION}"
>  PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"

Merged to master, thanks.

Richard