diff options
| -rw-r--r-- | meta/classes/multilib.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 7 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-pygobject_2.27.91.bb | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 0ea1038de9..6c0dd37930 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -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): diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index cd22163894..2da66a5e6e 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -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 diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 3133bf1831..b9da33ae4a 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -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}" diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb index 9ff2fe7ddb..fd696a5515 100644 --- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb +++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb @@ -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" |