mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

multilib: remove the multilib handling to allarch

Browse Source 
currently we have allarch type of recipes, which may still have
architecture dependency, like x11-common. So we need to drop the
handling to allarch in multilib case.

Also remove the PV postfix in python-pygobject DEPENDS, since multilib
code will treat a native package multilib capable.

[YOCTO #1497]
[YOCTO #1498]

(From OE-Core rev: 64c0279e6b0d2325a326058476228360898550f3)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu
2011-09-27 19:08:47 +08:00
committed by Richard Purdie
parent 9184d807f7
commit 6f6863a258
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/multilib.bbclass
View File

@@ -8,7 +8,7 @@ python multilib_virtclass_handler () {
return
# There should only be one kernel in multilib configs
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
if bb.data.inherits_class('image', e.data):

2
meta/classes/multilib_global.bbclass
View File

@@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
variant = e.data.getVar("BBEXTENDVARIANT", True)
if isinstance(e, bb.event.RecipeParsed) and not variant:
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
# Process PROVIDES

7
meta/conf/multilib.conf
View File

@@ -452,3 +452,10 @@ BBCLASSEXTEND_append_pn-zip = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-zlib = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-zypper = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-libsdl = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-qemu-config = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-x11-common = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-update-rc.d = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-avahi-ui = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-python-pycairo = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-python-pygtk = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-python-pygobject = " ${MULTILIBS}"

2
meta/recipes-devtools/python/python-pygobject_2.27.91.bb
View File

@@ -2,7 +2,7 @@ DESCRIPTION = "Python GObject bindings"
SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
DEPENDS = "python python-pygobject-native-${PV} glib-2.0"
DEPENDS = "python python-pygobject-native glib-2.0"
DEPENDS_virtclass-native = "glib-2.0-native"
RDEPENDS_virtclass-native = ""
PR = "r2"