Pull request
cover Pull request
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 <[email protected]>
---
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(-)
Signature · 1 line
1.7.5.rc1
PATCH 1/4 gconf-dbus: add SRCREV to recipe
* taken from meta/conf/distro/include/poky-default-revisions.inc for those who want gconf-dbus and are not using poky
--- meta/recipes-gnome/gnome/gconf-dbus_svn.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-gnome/gnome/gconf-dbus_svn.bb +1 -0
@@ -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"
Signature · 1 line
1.7.5.rc1
PATCH 2/4 xf86-video-omapfb: add SRCREV to recipe
In reply to Martin Jansa* taken from meta/conf/distro/include/poky-default-revisions.inc for those who want xf86-video-omapfb and are not using poky
--- .../xorg-driver/xf86-video-omapfb_git.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +1 -0
@@ -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 \
Signature · 1 line
1.7.5.rc1
Re: [PATCH 2/4] xf86-video-omapfb: add SRCREV to recipe
Op 18 apr 2011, om 10:00 heeft Martin Jansa het volgende geschreven:
Quoted 2 lines
* 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 :)
Quoted 26 lines
Signed-off-by Martin Jansa <[email protected]>---
.../xorg-driver/xf86-video-omapfb_git.bb | 1 +1 files changed, 1 insertions(+), 0 deletions(-)meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +0
-0@@ -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 \Signature · 7 lines
1.7.5.rc1 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 2/4] xf86-video-omapfb: add SRCREV to recipe
Quoted 7 lines · Koen Kooi
Op 18 apr 2011, om 10:00 heeft Martin Jansa het volgende geschreven:
Quoted 2 lines
* 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..
Quoted 19 lines
Quoted 19 lines
Signed-off-by Martin Jansa <[email protected]>---
.../xorg-driver/xf86-video-omapfb_git.bb | 1 +1 files changed, 1 insertions(+), 0 deletions(-)meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +0
-0@@ -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 \Signature · 1 line
1.7.5.rc1
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 3/4 task-base: allow distribution to define apm provider
In reply to Martin Jansa--- meta/recipes-core/tasks/task-base.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-core/tasks/task-base.bb +4 -1
@@ -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 = "\
Signature · 1 line
1.7.5.rc1
Re: [PATCH 3/4] task-base: allow distribution to define apm provider
Quoted 10 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/tasks/task-base.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)meta/recipes-core/tasks/task-base.bb +0
-0
meta/recipes-core/tasks/task-base.bb RDEPENDS_task-base-acpi = "\ · line 187
Quoted 10 lines
meta/recipes-core/tasks/task-base.bb +4
-1@@ -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
Quoted 26 lines · Richard Purdie
Quoted 10 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/tasks/task-base.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)meta/recipes-core/tasks/task-base.bb +0
-0meta/recipes-core/tasks/task-base.bb RDEPENDS_task-base-acpi = "\ · line 187
Quoted 10 lines
meta/recipes-core/tasks/task-base.bb +4
-1@@ -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 :/.
Quoted 3 lines
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,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 3/4] task-base: allow distribution to define apm provider
Quoted 15 lines · Martin Jansa
Quoted 14 lines · Richard Purdie
Quoted 13 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
meta/recipes-core/tasks/task-base.bb | 5 ++++-1 files changed, 4 insertions(+), 1 deletions(-)meta/recipes-core/tasks/task-base.bb +0
-0@@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\ acpid \libacpi "
Quoted 12 lines
Quoted 12 lines
Quoted 7 lines
meta/recipes-core/tasks/task-base.bb +3
-0+# 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
Quoted 20 lines
Quoted 3 lines
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: [email protected]_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 3/4] task-base: allow distribution to define apm provider
Op 27 apr 2011, om 22:08 heeft Khem Raj het volgende geschreven:
Quoted 29 lines · Martin Jansa
Quoted 15 lines · Richard Purdie
Quoted 14 lines · Martin Jansa
Quoted 13 lines
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-core/tasks/task-base.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)meta/recipes-core/tasks/task-base.bb +0
-0@@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\ acpid \ libacpi "Quoted 12 lines
Quoted 12 lines
meta/recipes-core/tasks/task-base.bb RDEPENDS_task-base-acpi = "\ · line 187
Quoted 7 lines
meta/recipes-core/tasks/task-base.bb +4
-1+# 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 :/.
Quoted 1 line
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
Quoted 32 lines · Koen Kooi
Op 27 apr 2011, om 22:08 heeft Khem Raj het volgende geschreven:
Quoted 29 lines · Martin Jansa
Quoted 27 lines · Richard Purdie
Quoted 26 lines · Martin Jansa
Quoted 16 lines
Signed-off-by Martin Jansa <[email protected]>---
meta/recipes-core/tasks/task-base.bb | 5 ++++-1 files changed, 4 insertions(+), 1 deletions(-)meta/recipes-core/tasks/task-base.bb +0
-0@@ -179,8 +179,11 @@ RDEPENDS_task-base-acpi = "\ acpid \libacpi "
meta/recipes-core/tasks/task-base.bb +3
-0+# Distro can override apm provider +DISTRO_APM ?= "apm" +Quoted 4 lines
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 :/.
Quoted 4 lines
Quoted 1 line
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
Quoted 8 lines
regards,
Koen
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
PATCH 4/4 python-dir.bbclass: define default PYTHON_BASEVERSION
In reply to Martin Jansa--- meta/classes/python-dir.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/classes/python-dir.bbclass +1 -0
@@ -1,2 +1,3 @@ +PYTHON_BASEVERSION ?= "2.6" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
Signature · 1 line
1.7.5.rc1
Richard Purdie
AppliedRe: [PATCH 4/4] python-dir.bbclass: define default PYTHON_BASEVERSION
meta/classes/python-dir.bbclass line 3
Quoted 13 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- meta/classes/python-dir.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)meta/classes/python-dir.bbclass +1
-0@@ -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