[oe] [meta-browser][PATCH 2/3] chromium: disable CHROMIUM_ENABLE_WAYLAND in the x11 recipe

Jacobo Aragunde Pérez jaragunde at igalia.com
Wed Jan 4 18:11:33 UTC 2017


The chromium x11 recipe may crash when run with CHROMIUM_ENABLE_WAYLAND
enabled, because it misses some steps that are performed in the
chromium-wayland recipe. Doing this change, we eliminate one possible
failure point.

Also adds a check for x11 in DISTRO_FEATURES.

Signed-off-by: Jacobo Aragunde Pérez <jaragunde at igalia.com>
---
 recipes-browser/chromium/chromium_52.0.2743.76.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/recipes-browser/chromium/chromium_52.0.2743.76.bb b/recipes-browser/chromium/chromium_52.0.2743.76.bb
index 14b519c..a3270e9 100644
--- a/recipes-browser/chromium/chromium_52.0.2743.76.bb
+++ b/recipes-browser/chromium/chromium_52.0.2743.76.bb
@@ -1,3 +1,5 @@
+CHROMIUM_ENABLE_WAYLAND = "0"
+
 include chromium-browser.inc
 
 DEPENDS += "xextproto gtk+ libxi libxss"
@@ -16,3 +18,9 @@ SRC_URI += "\
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d"
 SRC_URI[md5sum] = "0fee71466e1f2dc39ed4549d04b58ee2"
 SRC_URI[sha256sum] = "c54cdc11c3324152f3d5be98dcb4eae2bda0fc9dac7dd5f9010150458d68c18c"
+
+# X11 must be available for this flavor of Chromium
+python() {
+    if not bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d):
+        raise bb.parse.SkipPackage("X11 is not available")
+}
-- 
2.7.4




More information about the Openembedded-devel mailing list