Commit Graph

9 Commits

Author SHA1 Message Date
Leonardo Sandoval 23ea6ac574 waffle: fix REQUIRED_DISTRO_FEATURES and PACKAGECONFIG virtual/libgl dependencies
Waffle's REQUIRED_DISTRO_FEATURES statement looks into DEPENDS and if
virtual/libgl is present, it includes opengl as distro feature. However,
in a multilib environment, recipes provides virtual/${MLPREFIX}libgl,
thus waffle recipe needs to include the prefix. Also PACKAGECONFIG
statements need this change in order to properly include the libgl
dependency.

The way this error showed up was in a multilib environment and a distro
not containing opengl, i.e. nodistro, leading the following error when
building world -S none (because opengl was not included as required distro
feature):

    ERROR: Nothing PROVIDES 'virtual/lib32-libgl' (but virtual:multilib:lib32:/meta/recipes-graphics/waffle/waffle_1.5.2.bb DEPENDS on or otherwise requires it). Close matches:
      virtual/lib32-libsdl
      virtual/lib32-libc
      virtual/lib32-libsdl2
    ERROR: Required build target 'lib32-meta-world-pkgdata' has no buildable providers.
    Missing or unbuildable dependency chain was: ['lib32-meta-world-pkgdata', 'meta-world-pkgdata', 'lib32-waffle', 'virtual/lib32-libgl']

    Summary: There were 2 ERROR messages shown, returning a non-zero exit code.

[YOCTO #10900]

(From OE-Core rev: 2e3344a3b6d5c709ab0d368dd171240ab5cc6e22)

(From OE-Core rev: 8b0c5abe824647c6c9205ecedd29c3ac54c423a5)

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-09-21 16:55:57 +01:00
Christopher Larson 99ae8c0919 waffle: add opengl to REQUIRED_DISTRO_FEATURES
Multiple packageconfigs depend upon virtual/libgl, whose providers require the
opengl distro feature.

(From OE-Core rev: 930c5a17b543bef9d5c2efe71680f82993d77269)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-05 13:54:06 +00:00
Alexander Kanavin dff038aad5 waffle: update to 1.5.2
(From OE-Core rev: 7d977e4e9aa4986e59ca99342af8c57e7cfb45e1)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-26 22:49:39 +00:00
Alexander Kanavin 976f0e35c6 package_regex.inc: split the rest of the entries to their recipes
(From OE-Core rev: 73e2555cc7d529a93362b3fcfea3fbc7a4c60ca1)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:52 +00:00
Khem Raj 5942dfec50 waffle: Fix build with musl
Backport needed patches for compilation fixes on musl

(From OE-Core rev: d19772d1f3c9d0a06c10dfb246bb156b575a14c5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-28 12:00:26 +01:00
Jussi Kukkonen 320d766fe4 waffle: Upgrade 1.3.0 -> 1.5.1
* Update SRC_URI to waffle-gl.org
* Add new cmake files to -dev package
* Inherit lib_package so the new wflinfo binary is packaged properly
* Fix PACKAGECONFIG line for gbm
* Add the not-found configuration for all PACKAGECONFIG options to make
  builds reproducible (the default builds if dependencies are there)

(From OE-Core rev: f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-29 10:17:14 +01:00
Robert Yang b741051080 recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES
They can't be built withou x11 in DISTRO_FEATURES.

(From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-14 11:43:58 +01:00
Paul Eggleton c65e36478f waffle: drop unneeded setting of EXTRA_OECMAKE
base.bbclass already sets EXTRA_OECMAKE when cmake.bbclass is inherited.

(From OE-Core rev: c9959f2a69e7edfe8b9e4a7bc99f0d77f03aff73)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-20 11:03:43 +00:00
Ross Burton 971c2e09c6 waffle: add (from meta-oe)
Waffle is needed for Piglit.  This recipe is based on the recipe in meta-oe,
upgraded to the latest upstream 1.3.0.

(From OE-Core rev: 67228f682cb8acc71dd5f8b44af67f529727f780)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-14 17:03:57 +00:00