Skip to contentSkip to conversation

REQUIRED_DISTRO_FEATURES

PATCH Superseded Martin Jansa 1 participant 5 messages Jan 28, 2015

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

v4 cover REQUIRED_DISTRO_FEATURES

Changes since v3:
xf86-* resolved xorg-driver-common.inc

piglit moved to separate commit which maybe won't be merged if piglit if fixed sooner

more recipes were updated, in the end I could delete 116 entries from my blacklist

The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4:

net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib jansa/distro
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/distro

Martin Jansa (4):
recipes: add x11 to required DISTRO_FEATURES
xorg-driver: add x11 to required DISTRO_FEATURES
recipes-qt: add x11 to required DISTRO_FEATURES
piglit: add x11 to required DISTRO_FEATURES

 meta/classes/qt4x11.bbclass                                          | 5 ++++-
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb          | 4 +++-
 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb                     | 4 ++++
 meta/recipes-graphics/fstests/fstests_git.bb                         | 4 +++-
 meta/recipes-graphics/glew/glew_1.11.0.bb                            | 4 +++-
 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb                | 4 +++-
 .../recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 4 +++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb                 | 4 +++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb                 | 4 +++-
 meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb    | 4 +++-
 meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | 4 +++-
 meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb         | 4 +++-
 meta/recipes-graphics/piglit/piglit_git.bb                           | 4 +++-
 meta/recipes-graphics/pong-clock/pong-clock_1.0.bb                   | 4 ++++
 .../startup-notification/startup-notification_0.12.bb                | 4 +++-
 meta/recipes-graphics/x11-common/x11-common_0.1.bb                   | 4 ++++
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb                        | 4 +++-
 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb     | 4 +++-
 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc             | 4 +++-
 meta/recipes-graphics/xrestop/xrestop_0.4.bb                         | 4 +++-
 meta/recipes-graphics/xtscal/xtscal_0.6.3.bb                         | 4 +++-
 meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb    | 4 ++++
 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb        | 4 +++-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb                      | 4 +++-
 meta/recipes-support/consolekit/consolekit_0.4.6.bb                  | 4 +++-
 25 files changed, 80 insertions(+), 21 deletions(-)
Signature · 1 line
2.2.1
author
#1 lore raw

PATCH v4 1/4 recipes: add x11 to required DISTRO_FEATURES

* 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 <[email protected]>
---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb           | 4 +++-
 meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb                      | 4 ++++
 meta/recipes-graphics/fstests/fstests_git.bb                          | 4 +++-
 meta/recipes-graphics/glew/glew_1.11.0.bb                             | 4 +++-
 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb                 | 4 +++-
 meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 4 +++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb                  | 4 +++-
 meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb                  | 4 +++-
 meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb     | 4 +++-
 meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb  | 4 +++-
 meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb          | 4 +++-
 meta/recipes-graphics/pong-clock/pong-clock_1.0.bb                    | 4 ++++
 .../startup-notification/startup-notification_0.12.bb                 | 4 +++-
 meta/recipes-graphics/x11-common/x11-common_0.1.bb                    | 4 ++++
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb                         | 4 +++-
 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb      | 4 +++-
 meta/recipes-graphics/xrestop/xrestop_0.4.bb                          | 4 +++-
 meta/recipes-graphics/xtscal/xtscal_0.6.3.bb                          | 4 +++-
 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb         | 4 +++-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb                       | 4 +++-
 meta/recipes-support/consolekit/consolekit_0.4.6.bb                   | 4 +++-
 21 files changed, 66 insertions(+), 18 deletions(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +3 -1
index af57fac..01a8b43 100644
@@ -7,7 +7,9 @@ DESCRIPTION = "Packages required to run the build system"
 PR = "r13"
 LICENSE = "MIT"
 
-inherit packagegroup
+inherit packagegroup  distro_features_check
+# rdepends on libx11-dev
+REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGES = "\
     packagegroup-self-hosted \
meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb +4 -0
index 18fc893..3427fdf 100644
@@ -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)"
meta/recipes-graphics/fstests/fstests_git.bb +3 -1
index 57ff9f6..95c33f4 100644
@@ -13,4 +13,6 @@ 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
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
meta/recipes-graphics/glew/glew_1.11.0.bb +3 -1
index 4231320..7eb3532 100644
@@ -18,4 +18,6 @@ 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
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb +3 -1
index 4acac39..f2eb675 100644
@@ -16,7 +16,9 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BP
 SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
 SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGECONFIG ??= "jpeg png xft xsettings"
 PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +3 -1
index d7a8030..670d9fc 100644
@@ -28,7 +28,9 @@ SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599
 
 S = "${WORKDIR}/Xsettings-client-0.10"
 
-inherit autotools gettext
+inherit autotools gettext distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 do_configure_prepend() {
     # This package doesn't ship with its own COPYING file and
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +3 -1
index 8ee42c3..32e05bb 100644
@@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 FILES_${PN} = "${bindir}/* \
 	       ${datadir}/matchbox \
meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +3 -1
index 154b967..422d255 100644
@@ -18,7 +18,9 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/matchbox \
meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +3 -1
index 2eff371..17301a0 100644
@@ -3,7 +3,9 @@ DESCRIPTION = "Packages required to set up a basic working X11 session"
 LICENSE = "MIT"
 PR = "r1"
 
-inherit packagegroup
+inherit packagegroup distro_features_check
+# rdepends on matchbox-wm
+REQUIRED_DISTRO_FEATURES = "x11"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-x11-xserver \
meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +3 -1
index 2d68e97..c53f1b7 100644
@@ -8,7 +8,9 @@ PR = "r40"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit packagegroup
+inherit packagegroup distro_features_check
+# rdepends on XSERVER
+REQUIRED_DISTRO_FEATURES = "x11"
 
 XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 XSERVERCODECS ?= ""
meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +3 -1
index fde5144..3537d8c 100644
@@ -5,7 +5,9 @@
 LICENSE = "MIT"
 PR = "r40"
 
-inherit packagegroup
+inherit packagegroup distro_features_check
+# rdepends on x11-common
+REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGES = "${PN} ${PN}-utils"
meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +4 -0
index fe886f5..0e1a792 100644
@@ -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"
meta/recipes-graphics/startup-notification/startup-notification_0.12.bb +3 -1
index 363bdcd..6c1b93c 100644
@@ -17,7 +17,9 @@ SECTION = "libs"
 
 DEPENDS = "virtual/libx11 libsm xcb-util"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \
            file://obsolete_automake_macros.patch \
meta/recipes-graphics/x11-common/x11-common_0.1.bb +4 -0
index a2d8885..156b329 100644
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 PR = "r47"
 
+inherit distro_features_check
+# rdepends on xdypinfo xmodmap xinit
+REQUIRED_DISTRO_FEATURES = "x11"
+
 SRC_URI = "file://etc \
            file://gplv2-license.patch"
meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +3 -1
index 3d98172..ec0241f 100644
@@ -16,7 +16,9 @@ SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a
 
 DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
 
-inherit autotools-brokensep
+inherit autotools-brokensep distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
 PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +3 -1
index 562434f..a9de3d7 100644
@@ -7,7 +7,9 @@ DEPENDS = "virtual/libx11 libxi"
 PV = "0.7.5+git${SRCPV}"
 PR = "r6"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
 SRC_URI = "git://github.com/tias/xinput_calibrator.git \
meta/recipes-graphics/xrestop/xrestop_0.4.bb +3 -1
index 20d66be..ce5df03 100644
@@ -19,4 +19,6 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-${PV}.tar.
 SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b"
 SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
meta/recipes-graphics/xtscal/xtscal_0.6.3.bb +3 -1
index 7e01775..4bfddf0 100644
@@ -23,7 +23,9 @@ SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34"
 SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 do_install_append() {
     install -d ${D}${sysconfdir}/X11/Xsession.d/
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +3 -1
index bc3e0fd..6fb264f 100644
@@ -8,7 +8,9 @@ PR = "r33"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit packagegroup
+inherit packagegroup distro_features_check
+# rdepends on x11vnc
+REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
meta/recipes-support/atk/at-spi2-core_2.14.1.bb +3 -1
index 8d01124..1a1ce6c 100644
@@ -11,7 +11,9 @@ SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f4
 
 DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
 
-inherit autotools gtk-doc pkgconfig
+inherit autotools gtk-doc pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 EXTRA_OECONF = "--disable-introspection --disable-xevie --with-dbus-daemondir=${bindir}"
meta/recipes-support/consolekit/consolekit_0.4.6.bb +3 -1
index dfbd11c..66a892a 100644
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11"
 RDEPENDS_${PN} += "base-files"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \
            file://sepbuildfix.patch \
Signature · 1 line
2.2.1
author
#2 lore raw

PATCH v4 2/4 xorg-driver: add x11 to required DISTRO_FEATURES

In reply to Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +3 -1
index 17fac8b..7a710dc 100644
@@ -16,7 +16,9 @@ S = "${WORKDIR}/${BPN}-${PV}"
 FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
 FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/xserver
+REQUIRED_DISTRO_FEATURES = "x11"
 
 # FIXME: We don't want to include the libtool archives (*.la) from modules
 # directory, as they serve no useful purpose. Upstream should fix Makefile.am
Signature · 1 line
2.2.1
author
#3 lore raw

PATCH v4 3/4 recipes-qt: add x11 to required DISTRO_FEATURES

In reply to 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 <[email protected]>
---
 meta/classes/qt4x11.bbclass                                       | 5 ++++-
 meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)
meta/classes/qt4x11.bbclass +4 -1
index b06e15d..6f06d34 100644
@@ -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"
meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb +4 -0
index 0e7c800..772c151 100644
@@ -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)} \
Signature · 1 line
2.2.1
author
#4 lore raw

PATCH v4 4/4 piglit: add x11 to required DISTRO_FEATURES

In reply to Martin Jansa

* there is some pending work to resolve this unnecessary x11 dependency, this can be reverted together with x11 dependency removal

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-graphics/piglit/piglit_git.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +3 -1
index f468120..68ac7e7 100644
@@ -13,7 +13,9 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
 
-inherit cmake pythonnative
+inherit cmake pythonnative distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
 
 # As piglit doesn't install, enforce in-tree builds so that we can easily copy
 # contents out of $S and $B.
Signature · 1 line
2.2.1