multilib: remove the multilib handling to allarch
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: d9dc64a251bc66f16a0c5d12aa872152d43c4776) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7a541d69dd
commit
32b1c9150f
|
@ -8,7 +8,7 @@ python multilib_virtclass_handler () {
|
||||||
return
|
return
|
||||||
|
|
||||||
# There should only be one kernel in multilib configs
|
# 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")
|
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
|
||||||
|
|
||||||
if bb.data.inherits_class('image', e.data):
|
if bb.data.inherits_class('image', e.data):
|
||||||
|
|
|
@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
|
||||||
variant = e.data.getVar("BBEXTENDVARIANT", True)
|
variant = e.data.getVar("BBEXTENDVARIANT", True)
|
||||||
|
|
||||||
if isinstance(e, bb.event.RecipeParsed) and not variant:
|
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()
|
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
|
||||||
|
|
||||||
# Process PROVIDES
|
# Process PROVIDES
|
||||||
|
|
|
@ -452,3 +452,10 @@ BBCLASSEXTEND_append_pn-zip = " ${MULTILIBS}"
|
||||||
BBCLASSEXTEND_append_pn-zlib = " ${MULTILIBS}"
|
BBCLASSEXTEND_append_pn-zlib = " ${MULTILIBS}"
|
||||||
BBCLASSEXTEND_append_pn-zypper = " ${MULTILIBS}"
|
BBCLASSEXTEND_append_pn-zypper = " ${MULTILIBS}"
|
||||||
BBCLASSEXTEND_append_pn-libsdl = " ${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,7 +2,7 @@ DESCRIPTION = "Python GObject bindings"
|
||||||
SECTION = "devel/python"
|
SECTION = "devel/python"
|
||||||
LICENSE = "LGPLv2.1"
|
LICENSE = "LGPLv2.1"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
|
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"
|
DEPENDS_virtclass-native = "glib-2.0-native"
|
||||||
RDEPENDS_virtclass-native = ""
|
RDEPENDS_virtclass-native = ""
|
||||||
PR = "r2"
|
PR = "r2"
|
||||||
|
|
Loading…
Reference in New Issue