REQUIRED_DISTRO_FEATURES

PATCH In review Martin Jansa 2 participants 5 messages Feb 9, 2015 – Mar 10, 2015

lore

Share & tools

lore

Martin Jansa

author

2015-02-09 12:25 UTC #0 lore raw

v6 cover REQUIRED_DISTRO_FEATURES

Changes since v5:
Only rebased, matchbox-1.2 was removed last week.

The following changes since commit 234b4feef24ffe0cea9b6d88d9c51a05ee63db9e:

linux-yocto/3.14: fix qemumips build error (2015-02-08 08:00:04 +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 (1):
recipes: add x11 to required DISTRO_FEATURES

 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.12.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_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 +++-
 20 files changed, 63 insertions(+), 17 deletions(-)

Signature · 1 line

2.3.0

Martin Jansa

author

2015-02-09 12:25 UTC #1 lore raw

PATCH v6 1/1 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.12.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_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 +++-
 20 files changed, 63 insertions(+), 17 deletions(-)

meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +3 -1

index c471020..47589b6 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.12.0.bb +3 -1

index 9343604..eb28c4d 100644
@@ -18,4 +18,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
 SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1"
 SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf"
 
-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_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.3.0

Martin Jansa

author

2015-02-27 09:23 UTC #2 lore raw

Re: [PATCHv6 1/1] recipes: add x11 to required DISTRO_FEATURES

Quoted 3 lines · 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

PING

This was first sent 8 months ago, it's trivial change, please merge it in 1.8.

Quoted 316 lines

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.12.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_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 +++-
 20 files changed, 63 insertions(+), 17 deletions(-)

meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +3 -1

index c471020..47589b6 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.12.0.bb +3 -1

index 9343604..eb28c4d 100644
@@ -18,4 +18,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
 SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1"
 SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf"
 
-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_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.3.0

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2015-03-03 07:05 UTC #3 lore raw

Re: [PATCHv6 1/1] recipes: add x11 to required DISTRO_FEATURES

Quoted 9 lines · Martin Jansa

Quoted 3 lines · 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
PING
This was first sent 8 months ago, it's trivial change, please merge it in 1.8.

Ping!

This is very disappointing and probably one of my last patches to oe-core.

Quoted 319 lines

Quoted 316 lines

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.12.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_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 +++-
 20 files changed, 63 insertions(+), 17 deletions(-)

meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +3 -1

index c471020..47589b6 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.12.0.bb +3 -1

index 9343604..eb28c4d 100644
@@ -18,4 +18,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
 SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1"
 SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf"
 
-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_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.3.0

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Richard Purdie

2015-03-10 12:02 UTC #4 lore raw

Re: [PATCHv6 1/1] recipes: add x11 to required DISTRO_FEATURES

Quoted 8 lines · Martin Jansa

Quoted 7 lines · Martin Jansa
Quoted 3 lines · 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
PING

Quoted 7 lines

Quoted 2 lines
This was first sent 8 months ago, it's trivial change, please merge it in 1.8.
Ping!
This is very disappointing and probably one of my last patches to oe-core.

I did already talk and apologise to Martin about this, and there is a thread about this on the TSC list. This kind of delay is unacceptable, there were some reasons for it related to wanting to ideally do this better in bitbake. No such work has been forthcoming, nor is it likely to any time soon so I've taken this patch.

Sorry about the delay. Hopefully this is an exception rather than the way things tend to work.

I also do realise patches have been slow over the past week or two. Feature freeze caused a stampede of build breaking patches and its taken us a while to weed out the problematic ones and fix various bits of breakage :(. Hopefully we're back to "normal" now (keeping in mind this is now bug fixing for release in April). There are some upgrades that won't make it in, there was just too much too late to get everything in and maintain quality.

Cheers,

Richard