[PATCH 1/4] xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies

[PATCH 1/4] xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb      | 2 +-
 meta/recipes-graphics/xorg-app/xorg-app-common.inc | 5 ++++-
 meta/recipes-graphics/xorg-app/xprop_1.2.2.bb      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
index 96ea030..84d0cb8 100644
--- a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6"
 SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981"
 SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521"
 
-DEPENDS += " virtual/libx11 libxau libxt libxext libxmu libxrender"
+DEPENDS += "libxau libxt libxext libxmu libxrender"
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 524a2d3..59a04fa 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
@@ -5,12 +5,15 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native virtual/libx11"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 INC_PR = "r8"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/"
diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
index efbb1b3..d78bf04 100644
--- a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
@@ -10,7 +10,7 @@ formatting information."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91"
 
-DEPENDS += " libxmu virtual/libx11"
+DEPENDS += "libxmu"
 
 PE = "1"
 
-- 
2.0.2

[PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

* it's not complete, but recipes depending on virtual/libx11 are easiest
  to spot, I've long list of PNBLACKLIST for all recipes which cannot
  be built in distro without x11 in DISTRO_FEATURES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-gnome/gnome/gnome-desktop.inc                           | 5 ++++-
 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb                     | 4 ++++
 meta/recipes-graphics/fstests/fstests_git.bb                         | 5 ++++-
 meta/recipes-graphics/glew/glew_1.10.0.bb                            | 4 +++-
 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb                | 5 ++++-
 .../recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 5 ++++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb                 | 5 ++++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb                 | 5 ++++-
 meta/recipes-graphics/piglit/piglit_git.bb                           | 5 ++++-
 meta/recipes-graphics/pong-clock/pong-clock_1.0.bb                   | 4 ++++
 .../startup-notification/startup-notification_0.12.bb                | 5 ++++-
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb                        | 5 ++++-
 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb     | 5 ++++-
 13 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index 3853022..4aa664f 100644
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -3,6 +3,9 @@ SECTION = "x11/gnome"
 LICENSE = "GPLv2 & LGPLv2"
 DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
 
 do_configure_prepend () {
@@ -13,7 +16,7 @@ FILES_${PN} += "${datadir}/gnome-about ${datadir}/libgnome-desktop/pnp.ids"
 
 PR = "r6"
 
-inherit gnomebase
+inherit gnomebase distro_features_check
 
 do_install_append () {
 	sed -i -e's,${STAGING_BINDIR_NATIVE},${bindir},g' ${D}${bindir}/gnome-about
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
index 18fc893..3427fdf 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
+++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
@@ -5,4 +5,8 @@ include eglinfo.inc
 
 DEPENDS += "virtual/libx11"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SUMMARY += "(X11 version)"
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb
index 57ff9f6..5da7986 100644
--- a/meta/recipes-graphics/fstests/fstests_git.bb
+++ b/meta/recipes-graphics/fstests/fstests_git.bb
@@ -4,6 +4,9 @@ SECTION = "devel"
 LICENSE = "Zlib"
 DEPENDS = "pango libxext libxft virtual/libx11 gtk+"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0"
 PV = "0.1+git${SRCPV}"
 
@@ -13,4 +16,4 @@ LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac
 
 S = "${WORKDIR}/git/tests"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
diff --git a/meta/recipes-graphics/glew/glew_1.10.0.bb b/meta/recipes-graphics/glew/glew_1.10.0.bb
index 94f1bc1..4470f99 100644
--- a/meta/recipes-graphics/glew/glew_1.10.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.10.0.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
 
 DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://autotools.patch \
@@ -18,4 +20,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
 SRC_URI[md5sum] = "2f09e5e6cb1b9f3611bcac79bc9c2d5d"
 SRC_URI[sha256sum] = "99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307"
 
-inherit autotools lib_package pkgconfig
+inherit autotools lib_package pkgconfig distro_features_check
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index 4acac39..f688b4e 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -10,13 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
 
 DEPENDS = "virtual/libx11 libxext"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
            file://libpng.patch"
 
 SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
 SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 PACKAGECONFIG ??= "jpeg png xft xsettings"
 PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
index d7a8030..764eb95 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
@@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
                     file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
 DEPENDS = "virtual/libx11"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PR = "r5"
 
 headers = "xsettings-common.h xsettings-client.h"
@@ -28,7 +31,7 @@ SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599
 
 S = "${WORKDIR}/Xsettings-client-0.10"
 
-inherit autotools gettext
+inherit autotools gettext distro_features_check
 
 do_configure_prepend() {
     # This package doesn't ship with its own COPYING file and
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index 8ee42c3..662f85b 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2.0+"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat"
 PR = "r5"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
            file://configure_fix.patch \
            file://kbdconfig \
@@ -14,7 +17,7 @@ SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index 154b967..5512d7e 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
@@ -10,6 +10,9 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa
 SECTION = "x11/wm"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "29544f0e61cc281fc60061443a537271e1081b78"
 PV = "1.2+git${SRCPV}"
 
@@ -18,7 +21,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/matchbox \
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 7417cd5..64289ed 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -13,7 +13,10 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libx11 waffle virtual/libgl libglu python-mako-native python-numpy-native"
 
-inherit cmake pythonnative
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit cmake pythonnative distro_features_check
 
 # As piglit doesn't install, enforce in-tree builds so that we can easily copy
 # contents out of $S and $B.
diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
index fe886f5..0e1a792 100644
--- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
+++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
@@ -2,6 +2,10 @@ SUMMARY = "A clock combined with a game of pong"
 LICENSE = "GPLv2+"
 DEPENDS = "virtual/libx11 xdmcp xau"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "file://pong-clock-no-flicker.c"
 
 LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3"
diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
index 363bdcd..a9e89f6 100644
--- a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
+++ b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
@@ -17,7 +17,10 @@ SECTION = "libs"
 
 DEPENDS = "virtual/libx11 libsm xcb-util"
 
-inherit autotools pkgconfig
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit autotools pkgconfig distro_features_check
 
 SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \
            file://obsolete_automake_macros.patch \
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 3d98172..3178239 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -16,7 +16,10 @@ SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a
 
 DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
 
-inherit autotools-brokensep
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit autotools-brokensep distro_features_check
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
 PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 562434f..d1fe215 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -4,10 +4,13 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
 DEPENDS = "virtual/libx11 libxi"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PV = "0.7.5+git${SRCPV}"
 PR = "r6"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
 SRC_URI = "git://github.com/tias/xinput_calibrator.git \
-- 
2.0.2

[PATCH 3/4] xorg-driver: add x11 to required DISTRO_FEATURES

[Martin Jansa]

* it's not complete, but recipes depending on virtual/libx11 are easiest
  to spot, I've long list of PNBLACKLIST for all recipes which cannot
  be built in distro without x11 in DISTRO_FEATURES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb  | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb       | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb     | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb     | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb  | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
index cd8fd63..de6a4d8 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
@@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
 DEPENDS += "virtual/libx11 drm libpciaccess pixman"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI += "file://disable-dri2-tests.patch \
             file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
            "
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
index 544de4a..34912f3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
@@ -17,6 +17,10 @@ SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8b
 
 DEPENDS += "virtual/libx11 drm libpciaccess pixman"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}"
 
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
index 454d0a1..3c92ae0 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -24,6 +24,10 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
 DEPENDS += "virtual/libx11 libdrm xf86driproto"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
 PR = "${INC_PR}.3"
 PV = "0.4.2+gitr${SRCPV}"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 50ce4c2..a2141e9 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -9,6 +9,10 @@ LICENSE = "MIT-X & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
 DEPENDS += "virtual/libx11"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
 PR = "${INC_PR}.7"
 PV = "0.1.1+gitr${SRCPV}"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
index 4052f70..cd17068 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
@@ -13,6 +13,10 @@ PR = "${INC_PR}.0"
 
 DEPENDS += "virtual/libx11 randrproto libpciaccess"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
index 24041b5..619d9fe 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
@@ -11,6 +11,10 @@ DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
 SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \
             file://0002-add-option-for-vmwgfx.patch"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244"
 SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54"
 
-- 
2.0.2

[PATCH 4/4] recipes-qt: add x11 to required DISTRO_FEATURES

[Martin Jansa]

* it's not complete, but recipes depending on virtual/libx11 are easiest
  to spot, I've long list of PNBLACKLIST for all recipes which cannot
  be built in distro without x11 in DISTRO_FEATURES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/qt4x11.bbclass                                       | 5 ++++-
 meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 ++++
 meta/recipes-qt/qt4/qt4-x11-free.inc                              | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index 65d196a..bdbfc4a 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -1,7 +1,10 @@
 QT4DEPENDS ?= "qt4-x11 "
 DEPENDS_prepend = "${QT4DEPENDS}"
 
-inherit qmake2
+# depends on qt4-x11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit qmake2 distro_features_check
 
 QT_BASE_NAME = "qt4"
 QT_DIR_NAME = "qt4"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
index 0e7c800..772c151 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
@@ -4,6 +4,10 @@ QTLIBPREFIX = ""
 
 require packagegroup-qt-toolchain-target.inc
 
+inherit distro_features_check
+# depends on qt4-x11-free
+REQUIRED_DISTRO_FEATURES = "x11"
+
 RDEPENDS_${PN} += " \
         qt4-x11-free-dev \
         ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 3b1e0fe..b621f8e 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -8,6 +8,9 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender li
 PROVIDES += "qt4-x11"
 QT4DEPENDS = ""
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 INC_PR = "r50"
 
 QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
@@ -21,7 +24,7 @@ QT_BASE_LIB  ?= "libqt"
 QT_KDE_FLAGS ?= "-accessibility -sm"
 QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}"
 
-inherit qt4x11
+inherit qt4x11 distro_features_check
 
 do_install_append() {
   # fix pkgconfig, libtool and prl files
-- 
2.0.2

Re: [PATCH 3/4] xorg-driver: add x11 to required DISTRO_FEATURES

[Burton, Ross]

On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> +# depends on virtual/libx11

I think these comments are fairly redundant - it's an X11 driver, of
course it depends on X11. :)

Ross

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Burton, Ross]

On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> +REQUIRED_DISTRO_FEATURES = "x11"

Now I'm wondering why this is the solution.

If you attempt to build e.g. gnome-desktop explicitly without the x11
distro feature you understandably get an error message, because
gnome-desktop depends on libx11 which sanity checks the distro
features.  This seems correct.

Presumably you're problem is that you're running world builds and
they're producing errors on gnome-desktop because they can't satisfy a
dependency on libx11.  It seems that bubbling up the
REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
can't SkipPackage be handled specially, so if you do bitbake -k world
and libx11 emits SkipPackage, anything that has unsatisfiable
dependencies because of this is also skipped?

Ross

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]

On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
> On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> > +REQUIRED_DISTRO_FEATURES = "x11"
> 
> Now I'm wondering why this is the solution.
> 
> If you attempt to build e.g. gnome-desktop explicitly without the x11
> distro feature you understandably get an error message, because
> gnome-desktop depends on libx11 which sanity checks the distro
> features.  This seems correct.
> 
> Presumably you're problem is that you're running world builds and
> they're producing errors on gnome-desktop because they can't satisfy a
> dependency on libx11.  It seems that bubbling up the
> REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
> can't SkipPackage be handled specially, so if you do bitbake -k world
> and libx11 emits SkipPackage, anything that has unsatisfiable
> dependencies because of this is also skipped?

We discussed this many months ago and IIRC the conclusion was that user
should explicitly say that he wants to skip the recipes which depend on
something skipped (so that he is aware of what he is missing).

At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
created huge list of PNBLACKLISTs to blacklist everything not available
in our setup - so I can do world builds without ERRORs at the beginning.

REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
why I've sent this patchset to replace small part of my huge blacklist.

This is the list:
https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc

If someone has time to improve SkipPackage and we really want to skip
all depending packages, I would be glad to test such patch (because it
allows to easily drop all those blacklists for "depends-on-broken"
components)

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Richard Purdie]

On Thu, 2014-07-24 at 17:22 +0200, Martin Jansa wrote:
> On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
> > On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > +REQUIRED_DISTRO_FEATURES = "x11"
> > 
> > Now I'm wondering why this is the solution.
> > 
> > If you attempt to build e.g. gnome-desktop explicitly without the x11
> > distro feature you understandably get an error message, because
> > gnome-desktop depends on libx11 which sanity checks the distro
> > features.  This seems correct.
> > 
> > Presumably you're problem is that you're running world builds and
> > they're producing errors on gnome-desktop because they can't satisfy a
> > dependency on libx11.  It seems that bubbling up the
> > REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
> > can't SkipPackage be handled specially, so if you do bitbake -k world
> > and libx11 emits SkipPackage, anything that has unsatisfiable
> > dependencies because of this is also skipped?
> 
> We discussed this many months ago and IIRC the conclusion was that user
> should explicitly say that he wants to skip the recipes which depend on
> something skipped (so that he is aware of what he is missing).
> 
> At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
> created huge list of PNBLACKLISTs to blacklist everything not available
> in our setup - so I can do world builds without ERRORs at the beginning.
> 
> REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
> why I've sent this patchset to replace small part of my huge blacklist.
> 
> This is the list:
> https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc
> 
> If someone has time to improve SkipPackage and we really want to skip
> all depending packages, I would be glad to test such patch (because it
> allows to easily drop all those blacklists for "depends-on-broken"
> components)

The question here is whether we want a system which calculates what it
thinks is right or that we declare it.

The risk is that if SkipPackage (now known as SkipRecipe) were to
automatically "spread", you could in theory break the toolchain, have
nothing buildable and "bitbake world" would return success.

Effectively the -k option to bitbake already does the SkipPackage
"spread" idea since bitbake just removes dependencies until it works. If
does that in a fairly verbose way but it does so deliberately so you can
see what is going on.

The alternative is to declare what a given recipe supports and then we
can know whether it should be skipped or not under a given circumstance.

Personally, I'm leaning towards a more declarative approach where we
specify what should and shouldn't be expected to work. I'm open to
discussion on it though...

Cheers,

Richard

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3649 bytes --]

On Mon, Jul 28, 2014 at 02:18:30PM +0100, Richard Purdie wrote:
> On Thu, 2014-07-24 at 17:22 +0200, Martin Jansa wrote:
> > On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
> > > On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > > +REQUIRED_DISTRO_FEATURES = "x11"
> > > 
> > > Now I'm wondering why this is the solution.
> > > 
> > > If you attempt to build e.g. gnome-desktop explicitly without the x11
> > > distro feature you understandably get an error message, because
> > > gnome-desktop depends on libx11 which sanity checks the distro
> > > features.  This seems correct.
> > > 
> > > Presumably you're problem is that you're running world builds and
> > > they're producing errors on gnome-desktop because they can't satisfy a
> > > dependency on libx11.  It seems that bubbling up the
> > > REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
> > > can't SkipPackage be handled specially, so if you do bitbake -k world
> > > and libx11 emits SkipPackage, anything that has unsatisfiable
> > > dependencies because of this is also skipped?
> > 
> > We discussed this many months ago and IIRC the conclusion was that user
> > should explicitly say that he wants to skip the recipes which depend on
> > something skipped (so that he is aware of what he is missing).
> > 
> > At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
> > created huge list of PNBLACKLISTs to blacklist everything not available
> > in our setup - so I can do world builds without ERRORs at the beginning.
> > 
> > REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
> > why I've sent this patchset to replace small part of my huge blacklist.
> > 
> > This is the list:
> > https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc
> > 
> > If someone has time to improve SkipPackage and we really want to skip
> > all depending packages, I would be glad to test such patch (because it
> > allows to easily drop all those blacklists for "depends-on-broken"
> > components)
> 
> The question here is whether we want a system which calculates what it
> thinks is right or that we declare it.
> 
> The risk is that if SkipPackage (now known as SkipRecipe) were to
> automatically "spread", you could in theory break the toolchain, have
> nothing buildable and "bitbake world" would return success.
> 
> Effectively the -k option to bitbake already does the SkipPackage
> "spread" idea since bitbake just removes dependencies until it works. If
> does that in a fairly verbose way but it does so deliberately so you can
> see what is going on.
> 
> The alternative is to declare what a given recipe supports and then we
> can know whether it should be skipped or not under a given circumstance.
> 
> Personally, I'm leaning towards a more declarative approach where we
> specify what should and shouldn't be expected to work. I'm open to
> discussion on it though...

I agree with more declarative approach.

I don't mind maintaining PNBLACKLIST e.g. for components depending on
something we decided to blacklist ourselves in distro config.

But for components like this, where we really know that they won't work
without X11 in DISTRO_FEATURES, I think bitbake should skip them
automatically (thanks to REQUIRED_DISTRO_FEATURES). It already
automatically skips all recipes in xorg-lib directory, why it shouldn't
skip other recipes living somewhere else?

> Cheers,
> 
> Richard
> 
> 
> 
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3971 bytes --]

On Wed, Aug 06, 2014 at 01:48:31PM +0200, Martin Jansa wrote:
> On Mon, Jul 28, 2014 at 02:18:30PM +0100, Richard Purdie wrote:
> > On Thu, 2014-07-24 at 17:22 +0200, Martin Jansa wrote:
> > > On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
> > > > On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > > > +REQUIRED_DISTRO_FEATURES = "x11"
> > > > 
> > > > Now I'm wondering why this is the solution.
> > > > 
> > > > If you attempt to build e.g. gnome-desktop explicitly without the x11
> > > > distro feature you understandably get an error message, because
> > > > gnome-desktop depends on libx11 which sanity checks the distro
> > > > features.  This seems correct.
> > > > 
> > > > Presumably you're problem is that you're running world builds and
> > > > they're producing errors on gnome-desktop because they can't satisfy a
> > > > dependency on libx11.  It seems that bubbling up the
> > > > REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
> > > > can't SkipPackage be handled specially, so if you do bitbake -k world
> > > > and libx11 emits SkipPackage, anything that has unsatisfiable
> > > > dependencies because of this is also skipped?
> > > 
> > > We discussed this many months ago and IIRC the conclusion was that user
> > > should explicitly say that he wants to skip the recipes which depend on
> > > something skipped (so that he is aware of what he is missing).
> > > 
> > > At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
> > > created huge list of PNBLACKLISTs to blacklist everything not available
> > > in our setup - so I can do world builds without ERRORs at the beginning.
> > > 
> > > REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
> > > why I've sent this patchset to replace small part of my huge blacklist.
> > > 
> > > This is the list:
> > > https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc
> > > 
> > > If someone has time to improve SkipPackage and we really want to skip
> > > all depending packages, I would be glad to test such patch (because it
> > > allows to easily drop all those blacklists for "depends-on-broken"
> > > components)
> > 
> > The question here is whether we want a system which calculates what it
> > thinks is right or that we declare it.
> > 
> > The risk is that if SkipPackage (now known as SkipRecipe) were to
> > automatically "spread", you could in theory break the toolchain, have
> > nothing buildable and "bitbake world" would return success.
> > 
> > Effectively the -k option to bitbake already does the SkipPackage
> > "spread" idea since bitbake just removes dependencies until it works. If
> > does that in a fairly verbose way but it does so deliberately so you can
> > see what is going on.
> > 
> > The alternative is to declare what a given recipe supports and then we
> > can know whether it should be skipped or not under a given circumstance.
> > 
> > Personally, I'm leaning towards a more declarative approach where we
> > specify what should and shouldn't be expected to work. I'm open to
> > discussion on it though...
> 
> I agree with more declarative approach.
> 
> I don't mind maintaining PNBLACKLIST e.g. for components depending on
> something we decided to blacklist ourselves in distro config.
> 
> But for components like this, where we really know that they won't work
> without X11 in DISTRO_FEATURES, I think bitbake should skip them
> automatically (thanks to REQUIRED_DISTRO_FEATURES). It already
> automatically skips all recipes in xorg-lib directory, why it shouldn't
> skip other recipes living somewhere else?

Can we make some decision now?

> > Cheers,
> > 
> > Richard
> > 
> > 
> > 
> > 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Richard Purdie]

On Thu, 2014-10-30 at 14:20 +0100, Martin Jansa wrote:
> On Wed, Aug 06, 2014 at 01:48:31PM +0200, Martin Jansa wrote:
> > On Mon, Jul 28, 2014 at 02:18:30PM +0100, Richard Purdie wrote:
> > > On Thu, 2014-07-24 at 17:22 +0200, Martin Jansa wrote:
> > > > On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
> > > > > On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > > > > +REQUIRED_DISTRO_FEATURES = "x11"
> > > > > 
> > > > > Now I'm wondering why this is the solution.
> > > > > 
> > > > > If you attempt to build e.g. gnome-desktop explicitly without the x11
> > > > > distro feature you understandably get an error message, because
> > > > > gnome-desktop depends on libx11 which sanity checks the distro
> > > > > features.  This seems correct.
> > > > > 
> > > > > Presumably you're problem is that you're running world builds and
> > > > > they're producing errors on gnome-desktop because they can't satisfy a
> > > > > dependency on libx11.  It seems that bubbling up the
> > > > > REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
> > > > > can't SkipPackage be handled specially, so if you do bitbake -k world
> > > > > and libx11 emits SkipPackage, anything that has unsatisfiable
> > > > > dependencies because of this is also skipped?
> > > > 
> > > > We discussed this many months ago and IIRC the conclusion was that user
> > > > should explicitly say that he wants to skip the recipes which depend on
> > > > something skipped (so that he is aware of what he is missing).
> > > > 
> > > > At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
> > > > created huge list of PNBLACKLISTs to blacklist everything not available
> > > > in our setup - so I can do world builds without ERRORs at the beginning.
> > > > 
> > > > REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
> > > > why I've sent this patchset to replace small part of my huge blacklist.
> > > > 
> > > > This is the list:
> > > > https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc
> > > > 
> > > > If someone has time to improve SkipPackage and we really want to skip
> > > > all depending packages, I would be glad to test such patch (because it
> > > > allows to easily drop all those blacklists for "depends-on-broken"
> > > > components)
> > > 
> > > The question here is whether we want a system which calculates what it
> > > thinks is right or that we declare it.
> > > 
> > > The risk is that if SkipPackage (now known as SkipRecipe) were to
> > > automatically "spread", you could in theory break the toolchain, have
> > > nothing buildable and "bitbake world" would return success.
> > > 
> > > Effectively the -k option to bitbake already does the SkipPackage
> > > "spread" idea since bitbake just removes dependencies until it works. If
> > > does that in a fairly verbose way but it does so deliberately so you can
> > > see what is going on.
> > > 
> > > The alternative is to declare what a given recipe supports and then we
> > > can know whether it should be skipped or not under a given circumstance.
> > > 
> > > Personally, I'm leaning towards a more declarative approach where we
> > > specify what should and shouldn't be expected to work. I'm open to
> > > discussion on it though...
> > 
> > I agree with more declarative approach.
> > 
> > I don't mind maintaining PNBLACKLIST e.g. for components depending on
> > something we decided to blacklist ourselves in distro config.
> > 
> > But for components like this, where we really know that they won't work
> > without X11 in DISTRO_FEATURES, I think bitbake should skip them
> > automatically (thanks to REQUIRED_DISTRO_FEATURES). It already
> > automatically skips all recipes in xorg-lib directory, why it shouldn't
> > skip other recipes living somewhere else?
> 
> Can we make some decision now?

Well, I think there was an implied outcome of this:

a) We don't want to automatically do things, we want something
declarative

b) We therefore need to go and add REQUIRED_DISTRO_FEATURES = "x11" to
some further places.

As such, I'll take patches.

Was that what other people understood?

Cheers,

Richard

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Koen Kooi]

Op 30 okt. 2014, om 14:28 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Thu, 2014-10-30 at 14:20 +0100, Martin Jansa wrote:
>> On Wed, Aug 06, 2014 at 01:48:31PM +0200, Martin Jansa wrote:
>>> On Mon, Jul 28, 2014 at 02:18:30PM +0100, Richard Purdie wrote:
>>>> On Thu, 2014-07-24 at 17:22 +0200, Martin Jansa wrote:
>>>>> On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
>>>>>> On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
>>>>>>> +REQUIRED_DISTRO_FEATURES = "x11"
>>>>>> 
>>>>>> Now I'm wondering why this is the solution.
>>>>>> 
>>>>>> If you attempt to build e.g. gnome-desktop explicitly without the x11
>>>>>> distro feature you understandably get an error message, because
>>>>>> gnome-desktop depends on libx11 which sanity checks the distro
>>>>>> features.  This seems correct.
>>>>>> 
>>>>>> Presumably you're problem is that you're running world builds and
>>>>>> they're producing errors on gnome-desktop because they can't satisfy a
>>>>>> dependency on libx11.  It seems that bubbling up the
>>>>>> REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
>>>>>> can't SkipPackage be handled specially, so if you do bitbake -k world
>>>>>> and libx11 emits SkipPackage, anything that has unsatisfiable
>>>>>> dependencies because of this is also skipped?
>>>>> 
>>>>> We discussed this many months ago and IIRC the conclusion was that user
>>>>> should explicitly say that he wants to skip the recipes which depend on
>>>>> something skipped (so that he is aware of what he is missing).
>>>>> 
>>>>> At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
>>>>> created huge list of PNBLACKLISTs to blacklist everything not available
>>>>> in our setup - so I can do world builds without ERRORs at the beginning.
>>>>> 
>>>>> REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
>>>>> why I've sent this patchset to replace small part of my huge blacklist.
>>>>> 
>>>>> This is the list:
>>>>> https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc
>>>>> 
>>>>> If someone has time to improve SkipPackage and we really want to skip
>>>>> all depending packages, I would be glad to test such patch (because it
>>>>> allows to easily drop all those blacklists for "depends-on-broken"
>>>>> components)
>>>> 
>>>> The question here is whether we want a system which calculates what it
>>>> thinks is right or that we declare it.
>>>> 
>>>> The risk is that if SkipPackage (now known as SkipRecipe) were to
>>>> automatically "spread", you could in theory break the toolchain, have
>>>> nothing buildable and "bitbake world" would return success.
>>>> 
>>>> Effectively the -k option to bitbake already does the SkipPackage
>>>> "spread" idea since bitbake just removes dependencies until it works. If
>>>> does that in a fairly verbose way but it does so deliberately so you can
>>>> see what is going on.
>>>> 
>>>> The alternative is to declare what a given recipe supports and then we
>>>> can know whether it should be skipped or not under a given circumstance.
>>>> 
>>>> Personally, I'm leaning towards a more declarative approach where we
>>>> specify what should and shouldn't be expected to work. I'm open to
>>>> discussion on it though...
>>> 
>>> I agree with more declarative approach.
>>> 
>>> I don't mind maintaining PNBLACKLIST e.g. for components depending on
>>> something we decided to blacklist ourselves in distro config.
>>> 
>>> But for components like this, where we really know that they won't work
>>> without X11 in DISTRO_FEATURES, I think bitbake should skip them
>>> automatically (thanks to REQUIRED_DISTRO_FEATURES). It already
>>> automatically skips all recipes in xorg-lib directory, why it shouldn't
>>> skip other recipes living somewhere else?
>> 
>> Can we make some decision now?
> 
> Well, I think there was an implied outcome of this:
> 
> a) We don't want to automatically do things, we want something
> declarative
> 
> b) We therefore need to go and add REQUIRED_DISTRO_FEATURES = "x11" to
> some further places.
> 
> As such, I'll take patches.
> 
> Was that what other people understood?

That's how I read it and FWIW, I agree.

regards,

Koen

Re: [PATCH 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4674 bytes --]

On Thu, Oct 30, 2014 at 03:18:50PM +0100, Koen Kooi wrote:
> 
> Op 30 okt. 2014, om 14:28 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:
> 
> > On Thu, 2014-10-30 at 14:20 +0100, Martin Jansa wrote:
> >> On Wed, Aug 06, 2014 at 01:48:31PM +0200, Martin Jansa wrote:
> >>> On Mon, Jul 28, 2014 at 02:18:30PM +0100, Richard Purdie wrote:
> >>>> On Thu, 2014-07-24 at 17:22 +0200, Martin Jansa wrote:
> >>>>> On Thu, Jul 24, 2014 at 02:52:45PM +0100, Burton, Ross wrote:
> >>>>>> On 24 July 2014 14:42, Martin Jansa <martin.jansa@gmail.com> wrote:
> >>>>>>> +REQUIRED_DISTRO_FEATURES = "x11"
> >>>>>> 
> >>>>>> Now I'm wondering why this is the solution.
> >>>>>> 
> >>>>>> If you attempt to build e.g. gnome-desktop explicitly without the x11
> >>>>>> distro feature you understandably get an error message, because
> >>>>>> gnome-desktop depends on libx11 which sanity checks the distro
> >>>>>> features.  This seems correct.
> >>>>>> 
> >>>>>> Presumably you're problem is that you're running world builds and
> >>>>>> they're producing errors on gnome-desktop because they can't satisfy a
> >>>>>> dependency on libx11.  It seems that bubbling up the
> >>>>>> REQUIRED_DISTRO_FEATURES tests isn't the right thing to do here - why
> >>>>>> can't SkipPackage be handled specially, so if you do bitbake -k world
> >>>>>> and libx11 emits SkipPackage, anything that has unsatisfiable
> >>>>>> dependencies because of this is also skipped?
> >>>>> 
> >>>>> We discussed this many months ago and IIRC the conclusion was that user
> >>>>> should explicitly say that he wants to skip the recipes which depend on
> >>>>> something skipped (so that he is aware of what he is missing).
> >>>>> 
> >>>>> At that time there wasn't REQUIRED_DISTRO_FEATURES support, so I've
> >>>>> created huge list of PNBLACKLISTs to blacklist everything not available
> >>>>> in our setup - so I can do world builds without ERRORs at the beginning.
> >>>>> 
> >>>>> REQUIRED_DISTRO_FEATURES seems to me like reasonable compromise, that's
> >>>>> why I've sent this patchset to replace small part of my huge blacklist.
> >>>>> 
> >>>>> This is the list:
> >>>>> https://github.com/openwebos/meta-webos/blob/master/conf/distro/include/webos-recipe-blacklist-world.inc
> >>>>> 
> >>>>> If someone has time to improve SkipPackage and we really want to skip
> >>>>> all depending packages, I would be glad to test such patch (because it
> >>>>> allows to easily drop all those blacklists for "depends-on-broken"
> >>>>> components)
> >>>> 
> >>>> The question here is whether we want a system which calculates what it
> >>>> thinks is right or that we declare it.
> >>>> 
> >>>> The risk is that if SkipPackage (now known as SkipRecipe) were to
> >>>> automatically "spread", you could in theory break the toolchain, have
> >>>> nothing buildable and "bitbake world" would return success.
> >>>> 
> >>>> Effectively the -k option to bitbake already does the SkipPackage
> >>>> "spread" idea since bitbake just removes dependencies until it works. If
> >>>> does that in a fairly verbose way but it does so deliberately so you can
> >>>> see what is going on.
> >>>> 
> >>>> The alternative is to declare what a given recipe supports and then we
> >>>> can know whether it should be skipped or not under a given circumstance.
> >>>> 
> >>>> Personally, I'm leaning towards a more declarative approach where we
> >>>> specify what should and shouldn't be expected to work. I'm open to
> >>>> discussion on it though...
> >>> 
> >>> I agree with more declarative approach.
> >>> 
> >>> I don't mind maintaining PNBLACKLIST e.g. for components depending on
> >>> something we decided to blacklist ourselves in distro config.
> >>> 
> >>> But for components like this, where we really know that they won't work
> >>> without X11 in DISTRO_FEATURES, I think bitbake should skip them
> >>> automatically (thanks to REQUIRED_DISTRO_FEATURES). It already
> >>> automatically skips all recipes in xorg-lib directory, why it shouldn't
> >>> skip other recipes living somewhere else?
> >> 
> >> Can we make some decision now?
> > 
> > Well, I think there was an implied outcome of this:
> > 
> > a) We don't want to automatically do things, we want something
> > declarative
> > 
> > b) We therefore need to go and add REQUIRED_DISTRO_FEATURES = "x11" to
> > some further places.
> > 
> > As such, I'll take patches.
> > 
> > Was that what other people understood?
> 
> That's how I read it and FWIW, I agree.

ping for Ross

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

[PATCHv2 1/4] xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb      | 2 +-
 meta/recipes-graphics/xorg-app/xorg-app-common.inc | 5 ++++-
 meta/recipes-graphics/xorg-app/xprop_1.2.2.bb      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
index 96ea030..84d0cb8 100644
--- a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6"
 SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981"
 SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521"
 
-DEPENDS += " virtual/libx11 libxau libxt libxext libxmu libxrender"
+DEPENDS += "libxau libxt libxext libxmu libxrender"
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 524a2d3..59a04fa 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
@@ -5,12 +5,15 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native virtual/libx11"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 INC_PR = "r8"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/"
diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
index efbb1b3..d78bf04 100644
--- a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
@@ -10,7 +10,7 @@ formatting information."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91"
 
-DEPENDS += " libxmu virtual/libx11"
+DEPENDS += "libxmu"
 
 PE = "1"
 
-- 
2.1.3

[PATCHv2 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

* it's not complete, but recipes depending on virtual/libx11 are easiest
  to spot, I've long list of PNBLACKLIST for all recipes which cannot
  be built in distro without x11 in DISTRO_FEATURES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb                     | 4 ++++
 meta/recipes-graphics/fstests/fstests_git.bb                         | 5 ++++-
 meta/recipes-graphics/glew/glew_1.11.0.bb                            | 4 +++-
 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb                | 5 ++++-
 .../recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 5 ++++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb                 | 5 ++++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb                 | 5 ++++-
 meta/recipes-graphics/piglit/piglit_git.bb                           | 5 ++++-
 meta/recipes-graphics/pong-clock/pong-clock_1.0.bb                   | 4 ++++
 .../startup-notification/startup-notification_0.12.bb                | 5 ++++-
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb                        | 5 ++++-
 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb     | 5 ++++-
 12 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
index 18fc893..3427fdf 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
+++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
@@ -5,4 +5,8 @@ include eglinfo.inc
 
 DEPENDS += "virtual/libx11"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SUMMARY += "(X11 version)"
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb
index 57ff9f6..5da7986 100644
--- a/meta/recipes-graphics/fstests/fstests_git.bb
+++ b/meta/recipes-graphics/fstests/fstests_git.bb
@@ -4,6 +4,9 @@ SECTION = "devel"
 LICENSE = "Zlib"
 DEPENDS = "pango libxext libxft virtual/libx11 gtk+"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0"
 PV = "0.1+git${SRCPV}"
 
@@ -13,4 +16,4 @@ LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac
 
 S = "${WORKDIR}/git/tests"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
diff --git a/meta/recipes-graphics/glew/glew_1.11.0.bb b/meta/recipes-graphics/glew/glew_1.11.0.bb
index 4231320..22bc4da 100644
--- a/meta/recipes-graphics/glew/glew_1.11.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.11.0.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
 
 DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://autotools.patch \
@@ -18,4 +20,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
 SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a"
 SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6"
 
-inherit autotools lib_package pkgconfig
+inherit autotools lib_package pkgconfig distro_features_check
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index 4acac39..f688b4e 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -10,13 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
 
 DEPENDS = "virtual/libx11 libxext"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
            file://libpng.patch"
 
 SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
 SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 PACKAGECONFIG ??= "jpeg png xft xsettings"
 PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
index d7a8030..764eb95 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
@@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
                     file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
 DEPENDS = "virtual/libx11"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PR = "r5"
 
 headers = "xsettings-common.h xsettings-client.h"
@@ -28,7 +31,7 @@ SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599
 
 S = "${WORKDIR}/Xsettings-client-0.10"
 
-inherit autotools gettext
+inherit autotools gettext distro_features_check
 
 do_configure_prepend() {
     # This package doesn't ship with its own COPYING file and
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
index 8ee42c3..662f85b 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2.0+"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat"
 PR = "r5"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
            file://configure_fix.patch \
            file://kbdconfig \
@@ -14,7 +17,7 @@ SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
index 154b967..5512d7e 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb
@@ -10,6 +10,9 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa
 SECTION = "x11/wm"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "29544f0e61cc281fc60061443a537271e1081b78"
 PV = "1.2+git${SRCPV}"
 
@@ -18,7 +21,7 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/matchbox \
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index f468120..83c1e18 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -13,7 +13,10 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
 
-inherit cmake pythonnative
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit cmake pythonnative distro_features_check
 
 # As piglit doesn't install, enforce in-tree builds so that we can easily copy
 # contents out of $S and $B.
diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
index fe886f5..0e1a792 100644
--- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
+++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
@@ -2,6 +2,10 @@ SUMMARY = "A clock combined with a game of pong"
 LICENSE = "GPLv2+"
 DEPENDS = "virtual/libx11 xdmcp xau"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "file://pong-clock-no-flicker.c"
 
 LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3"
diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
index 363bdcd..a9e89f6 100644
--- a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
+++ b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
@@ -17,7 +17,10 @@ SECTION = "libs"
 
 DEPENDS = "virtual/libx11 libsm xcb-util"
 
-inherit autotools pkgconfig
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit autotools pkgconfig distro_features_check
 
 SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \
            file://obsolete_automake_macros.patch \
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 3d98172..3178239 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -16,7 +16,10 @@ SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a
 
 DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
 
-inherit autotools-brokensep
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit autotools-brokensep distro_features_check
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
 PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 562434f..d1fe215 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -4,10 +4,13 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
 DEPENDS = "virtual/libx11 libxi"
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PV = "0.7.5+git${SRCPV}"
 PR = "r6"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
 
 SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
 SRC_URI = "git://github.com/tias/xinput_calibrator.git \
-- 
2.1.3

[PATCHv2 3/4] xorg-driver: add x11 to required DISTRO_FEATURES

[Martin Jansa]

* it's not complete, but recipes depending on virtual/libx11 are easiest
  to spot, I've long list of PNBLACKLIST for all recipes which cannot
  be built in distro without x11 in DISTRO_FEATURES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb  | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb       | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb     | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb     | 4 ++++
 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb  | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
index cd8fd63..de6a4d8 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
@@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
 DEPENDS += "virtual/libx11 drm libpciaccess pixman"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI += "file://disable-dri2-tests.patch \
             file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
            "
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
index a10cd9e..23733fd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
@@ -19,6 +19,10 @@ SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8b
 
 DEPENDS += "virtual/libx11 drm libpciaccess pixman"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}"
 
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
index 454d0a1..3c92ae0 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -24,6 +24,10 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
 DEPENDS += "virtual/libx11 libdrm xf86driproto"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
 PR = "${INC_PR}.3"
 PV = "0.4.2+gitr${SRCPV}"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 4ad2538..eefc6e1 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -9,6 +9,10 @@ LICENSE = "MIT-X & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
 DEPENDS += "virtual/libx11"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
 PR = "${INC_PR}.7"
 PV = "0.1.1+gitr${SRCPV}"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
index 4052f70..cd17068 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
@@ -13,6 +13,10 @@ PR = "${INC_PR}.0"
 
 DEPENDS += "virtual/libx11 randrproto libpciaccess"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
index 24041b5..619d9fe 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
@@ -11,6 +11,10 @@ DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
 SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \
             file://0002-add-option-for-vmwgfx.patch"
 
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244"
 SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54"
 
-- 
2.1.3

[PATCHv2 4/4] recipes-qt: add x11 to required DISTRO_FEATURES

[Martin Jansa]

* it's not complete, but recipes depending on virtual/libx11 are easiest
  to spot, I've long list of PNBLACKLIST for all recipes which cannot
  be built in distro without x11 in DISTRO_FEATURES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/qt4x11.bbclass                                       | 5 ++++-
 meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 ++++
 meta/recipes-qt/qt4/qt4-x11-free.inc                              | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index b06e15d..c3500ea 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -1,7 +1,10 @@
 QT4DEPENDS ?= "qt4-x11 "
 DEPENDS_prepend = "${QT4DEPENDS}"
 
-inherit qmake2
+# depends on qt4-x11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit qmake2 distro_features_check
 
 QT_BASE_NAME = "qt4"
 QT_DIR_NAME = "qt4"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
index 0e7c800..772c151 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
@@ -4,6 +4,10 @@ QTLIBPREFIX = ""
 
 require packagegroup-qt-toolchain-target.inc
 
+inherit distro_features_check
+# depends on qt4-x11-free
+REQUIRED_DISTRO_FEATURES = "x11"
+
 RDEPENDS_${PN} += " \
         qt4-x11-free-dev \
         ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 3b1e0fe..b621f8e 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -8,6 +8,9 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender li
 PROVIDES += "qt4-x11"
 QT4DEPENDS = ""
 
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 INC_PR = "r50"
 
 QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
@@ -21,7 +24,7 @@ QT_BASE_LIB  ?= "libqt"
 QT_KDE_FLAGS ?= "-accessibility -sm"
 QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}"
 
-inherit qt4x11
+inherit qt4x11 distro_features_check
 
 do_install_append() {
   # fix pkgconfig, libtool and prl files
-- 
2.1.3

Re: [PATCHv2 1/4] xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

On Wed, Dec 10, 2014 at 03:18:34PM +0100, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb      | 2 +-
>  meta/recipes-graphics/xorg-app/xorg-app-common.inc | 5 ++++-
>  meta/recipes-graphics/xorg-app/xprop_1.2.2.bb      | 2 +-
>  3 files changed, 6 insertions(+), 3 deletions(-)

Ping, this patchset is stalled since July 2014 :/

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCHv2 1/4] xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

On 18 January 2015 at 17:06, Martin Jansa <martin.jansa@gmail.com> wrote:

> Ping, this patchset is stalled since July 2014 :/
>

Whoops.  Merged into my mut for testing.

Thanks for the reminder!

Ross

[-- Attachment #2: Type: text/html, Size: 685 bytes --]

Re: [PATCHv2 2/4] recipes: add x11 to required DISTRO_FEATURES

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

On 10 December 2014 at 14:18, Martin Jansa <martin.jansa@gmail.com> wrote:

>  DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
>
> +# depends on virtual/libx11
> +REQUIRED_DISTRO_FEATURES = "x11"


Please drop piglit from this series, as that depending on x11 is a bug and
I've a branch that is sorting that.

But this does make me wonder why we can't make bitbake handle this for
us...  just thinking out loud... would it be possible to have a "recursive"
exception so that libx11 can say it needs the x11 DISTRO_FEATURE and
anything that depends on libx11 is cleanly handled instead of erroring?

Ross

[-- Attachment #2: Type: text/html, Size: 1138 bytes --]

Re: [PATCHv2 3/4] xorg-driver: add x11 to required DISTRO_FEATURES

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 604 bytes --]

On 10 December 2014 at 14:18, Martin Jansa <martin.jansa@gmail.com> wrote:

>  meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb  | 4 ++++
>  meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb | 4 ++++
>  meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb       | 4 ++++
>  meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb     | 4 ++++
>  meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb     | 4 ++++
>  meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb  | 4 ++++
>

There's a xorg-driver-common.inc you can patch instead.

Ross

[-- Attachment #2: Type: text/html, Size: 1565 bytes --]

Re: [PATCHv2 4/4] recipes-qt: add x11 to required DISTRO_FEATURES

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

On 10 December 2014 at 14:18, Martin Jansa <martin.jansa@gmail.com> wrote:

> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -8,6 +8,9 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft
> libxext libxrender li
>  PROVIDES += "qt4-x11"
>  QT4DEPENDS = ""
>
> +# depends on virtual/libx11
> +REQUIRED_DISTRO_FEATURES = "x11"
> +
>

Isn't that redundant as qt4x11 already sets REQUIRED_DISTRO_FEATURES?

Also, if setting REQURED_DISTRO_FEATURES in a class, using += or _append
seems like a sensible idea for future-proofing.

Ross

[-- Attachment #2: Type: text/html, Size: 1176 bytes --]

Re: [PATCHv2 2/4] recipes: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 826 bytes --]

On Tue, Jan 20, 2015 at 09:17:01PM +0000, Burton, Ross wrote:
> On 10 December 2014 at 14:18, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> >  DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu"
> >
> > +# depends on virtual/libx11
> > +REQUIRED_DISTRO_FEATURES = "x11"
> 
> 
> Please drop piglit from this series, as that depending on x11 is a bug and
> I've a branch that is sorting that.
> 
> But this does make me wonder why we can't make bitbake handle this for
> us...  just thinking out loud... would it be possible to have a "recursive"
> exception so that libx11 can say it needs the x11 DISTRO_FEATURE and
> anything that depends on libx11 is cleanly handled instead of erroring?

We have discussed this in July..

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCHv2 3/4] xorg-driver: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3146 bytes --]

On Tue, Jan 20, 2015 at 09:17:40PM +0000, Burton, Ross wrote:
> On 10 December 2014 at 14:18, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> >  meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb  | 4 ++++
> >  meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb | 4 ++++
> >  meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb       | 4 ++++
> >  meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb     | 4 ++++
> >  meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb     | 4 ++++
> >  meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb  | 4 ++++
> >
> 
> There's a xorg-driver-common.inc you can patch instead.

libx11 dependency isn't added in xorg-driver-common.inc:

OE @ ~/openembedded-core/meta/recipes-graphics/xorg-driver $ git grep libx11
xf86-video-intel_2.21.15.bb:DEPENDS += "virtual/libx11 drm libpciaccess pixman"
xf86-video-intel_2.21.15.bb:# depends on virtual/libx11
xf86-video-intel_2.99.917.bb:DEPENDS += "virtual/libx11 drm libpciaccess pixman"
xf86-video-intel_2.99.917.bb:# depends on virtual/libx11
xf86-video-omap_git.bb:DEPENDS += "virtual/libx11 libdrm xf86driproto"
xf86-video-omap_git.bb:# depends on virtual/libx11
xf86-video-omapfb_git.bb:DEPENDS += "virtual/libx11"
xf86-video-omapfb_git.bb:# depends on virtual/libx11
xf86-video-vesa_2.3.3.bb:DEPENDS += "virtual/libx11 randrproto libpciaccess"
xf86-video-vesa_2.3.3.bb:# depends on virtual/libx11
xf86-video-vmware_13.0.2.bb:DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
xf86-video-vmware_13.0.2.bb:# depends on virtual/libx11

and the .inc file is used in much more recipes (which don't need libx11 to build)
OE @ ~/openembedded-core/meta/recipes-graphics/xorg-driver $ git grep xorg-driver-common.inc
xorg-driver-input.inc:include xorg-driver-common.inc
xorg-driver-video.inc:include xorg-driver-common.inc

OE @ ~/openembedded-core/meta/recipes-graphics/xorg-driver $ git grep xorg-driver-input.inc
xf86-input-evdev_2.9.1.bb:require xorg-driver-input.inc
xf86-input-keyboard_1.8.0.bb:require xorg-driver-input.inc
xf86-input-keyboard_git.bb:require xorg-driver-input.inc
xf86-input-mouse_1.9.1.bb:require xorg-driver-input.inc
xf86-input-mouse_git.bb:require xorg-driver-input.inc
xf86-input-synaptics_1.8.1.bb:require xorg-driver-input.inc
xf86-input-synaptics_git.bb:require xorg-driver-input.inc
xf86-input-vmmouse_13.0.0.bb:require xorg-driver-input.inc

OE @ ~/openembedded-core/meta/recipes-graphics/xorg-driver $ git grep xorg-driver-video.inc
xf86-video-cirrus_1.5.2.bb:require xorg-driver-video.inc
xf86-video-fbdev_0.4.4.bb:require xorg-driver-video.inc
xf86-video-intel_2.21.15.bb:require xorg-driver-video.inc
xf86-video-intel_2.99.917.bb:require xorg-driver-video.inc
xf86-video-modesetting_0.9.0.bb:require xorg-driver-video.inc
xf86-video-omap_git.bb:require xorg-driver-video.inc
xf86-video-omapfb_git.bb:require xorg-driver-video.inc
xf86-video-vesa_2.3.3.bb:require xorg-driver-video.inc
xf86-video-vmware_13.0.2.bb:require xorg-driver-video.inc


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCHv2 4/4] recipes-qt: add x11 to required DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

On Tue, Jan 20, 2015 at 09:19:32PM +0000, Burton, Ross wrote:
> On 10 December 2014 at 14:18, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> > +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> > @@ -8,6 +8,9 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft
> > libxext libxrender li
> >  PROVIDES += "qt4-x11"
> >  QT4DEPENDS = ""
> >
> > +# depends on virtual/libx11
> > +REQUIRED_DISTRO_FEATURES = "x11"
> > +
> >
> 
> Isn't that redundant as qt4x11 already sets REQUIRED_DISTRO_FEATURES?
> 
> Also, if setting REQURED_DISTRO_FEATURES in a class, using += or _append
> seems like a sensible idea for future-proofing.

Done, good catch.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCHv2 3/4] xorg-driver: add x11 to required DISTRO_FEATURES

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

On 22 January 2015 at 16:34, Martin Jansa <martin.jansa@gmail.com> wrote:

> and the .inc file is used in much more recipes (which don't need libx11 to
> build)
>

You can't be arguing that it's alright to build the X11 drivers when the
X11 distro feature is disabled?  I thought the end goal was to cover all
X11 recipes, not just the ones that happen to link to libx11?

Ross

[-- Attachment #2: Type: text/html, Size: 790 bytes --]