summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-04-04 09:45:56 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-04-04 14:44:26 (GMT)
commit600c8a342c7465772bda5fd69fa7736a83669e91 (patch)
tree4c043641b8059850541d9fb2c1e7ff7bb6227ac2
parente726360655432ca8b509927f543f8acfb9b2330c (diff)
downloadmeta-intel-600c8a342c7465772bda5fd69fa7736a83669e91.tar.gz
meta-intel: support distro without OpenGL
When a distro disables OpenGL or using meta-intel without any distro set, a world build fails for all recipes depending directly or indirectly on libva, because libva is disables unless opengl is in DISTRO_FEATURES. "opengl" must be checked for in all those recipes. The specific use case was testing of meta-intel with yocto-compat-layer.py against just OE-core with the local.conf.sample from OE-core, i.e. DISTRO unset. Without this change, that failed with: ERROR: Nothing PROVIDES 'libva' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb, /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami_1.1.0.bb, /fast/work/meta-intel/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb DEPENDS on or otherwise requires it) ERROR: libva was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) ERROR: Nothing RPROVIDES 'libyami-dev' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami-dev' NOTE: Runtime target 'libyami-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami-dev'] ERROR: Nothing RPROVIDES 'libva' (but /fast/work/meta-intel/common/recipes-multimedia/libva/va-intel.bb RDEPENDS on or otherwise requires it) ERROR: libva was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) NOTE: Runtime target 'libva' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libva'] ERROR: Nothing RPROVIDES 'libva-intel-driver' (but /fast/work/meta-intel/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libva-intel-driver' NOTE: Runtime target 'libva-intel-driver' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libva-intel-driver'] ERROR: Nothing RPROVIDES 'libyami-utils' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami-utils' NOTE: Runtime target 'libyami-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami-utils'] ERROR: Nothing RPROVIDES 'libyami-utils-dev' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami-utils-dev' NOTE: Runtime target 'libyami-utils-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami-utils-dev'] ERROR: Nothing RPROVIDES 'libyami' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami' NOTE: Runtime target 'libyami' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami'] ERROR: Nothing RPROVIDES 'libva-intel-driver-dev' (but /fast/work/meta-intel/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libva-intel-driver-dev' NOTE: Runtime target 'libva-intel-driver-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libva-intel-driver-dev'] Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb4
-rw-r--r--common/recipes-multimedia/libva/va-intel.bb4
-rwxr-xr-xcommon/recipes-multimedia/libyami/libyami-utils_1.1.0.bb4
-rwxr-xr-xcommon/recipes-multimedia/libyami/libyami_1.1.0.bb4
4 files changed, 13 insertions, 3 deletions
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb
index 3850d4d..de294e5 100644
--- a/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb
+++ b/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb
@@ -19,7 +19,9 @@ SRCREV = "c747c3428cd862869b75e96b737fa61532d6f27f"
19 19
20S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
21 21
22inherit autotools pkgconfig 22inherit autotools pkgconfig distro_features_check
23
24REQUIRED_DISTRO_FEATURES = "opengl"
23 25
24PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ 26PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
25 ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}" 27 ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}"
diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb
index 21a3d4d..88539e2 100644
--- a/common/recipes-multimedia/libva/va-intel.bb
+++ b/common/recipes-multimedia/libva/va-intel.bb
@@ -26,3 +26,7 @@ RDEPENDS_va-intel = " \
26 " 26 "
27 27
28COMPATIBLE_HOST = '(i.86|x86_64).*-linux*' 28COMPATIBLE_HOST = '(i.86|x86_64).*-linux*'
29
30inherit distro_features_check
31
32REQUIRED_DISTRO_FEATURES = "opengl"
diff --git a/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb b/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb
index c61fec8..fcd28f8 100755
--- a/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb
+++ b/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb
@@ -18,4 +18,6 @@ DEPENDS = "libva libyami"
18 18
19EXTRA_OECONF = " --enable-tests-gles --disable-md5" 19EXTRA_OECONF = " --enable-tests-gles --disable-md5"
20 20
21inherit autotools pkgconfig 21inherit autotools pkgconfig distro_features_check
22
23REQUIRED_DISTRO_FEATURES = "opengl"
diff --git a/common/recipes-multimedia/libyami/libyami_1.1.0.bb b/common/recipes-multimedia/libyami/libyami_1.1.0.bb
index 83862b3..077c211 100755
--- a/common/recipes-multimedia/libyami/libyami_1.1.0.bb
+++ b/common/recipes-multimedia/libyami/libyami_1.1.0.bb
@@ -19,4 +19,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}
19PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" 19PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender"
20 20
21DEPENDS = "libva" 21DEPENDS = "libva"
22inherit autotools pkgconfig 22inherit autotools pkgconfig distro_features_check
23
24REQUIRED_DISTRO_FEATURES = "opengl"