[PATCH] mesa: Allow building the virgl driver to be configurable

[PATCH] mesa: Allow building the virgl driver to be configurable

[fdk17]

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

From 0a572f757f3d1d1c0e47a452cb4098ee7c228edb Mon Sep 17 00:00:00 2001
From: Fred Baksik <fred.baksik@mrcy.com>
Date: Thu, 19 Dec 2019 14:16:56 -0500
Subject: [PATCH] mesa: Allow building the virgl driver to be configurable

If a .bbappend file sets GALLIUMDRIVERS then virgl is always being
appended to the list of drivers to be built. Make virgl an optional
component.

Signed-off-by: Fred Baksik <fred.baksik@mrcy.com>
---
meta/recipes-graphics/mesa/mesa.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 9e5808ee27..b03df65c69 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -119,10 +119,11 @@ GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RE
GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"

PACKAGECONFIG[r600] = ""
+PACKAGECONFIG[virgl] = ""

GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}"
-GALLIUMDRIVERS_append = ",virgl"
+GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}"

PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS}, -Dgallium-drivers=''"
PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, llvm${MESA_LLVM_RELEASE} llvm-native \
--
2.17.1

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

Re: [PATCH] mesa: Allow building the virgl driver to be configurable

[Alexander Kanavin]

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

On Fri, 20 Dec 2019 at 12:21, fdk17 <fdk17@ftml.net> wrote:

> If a .bbappend file sets GALLIUMDRIVERS then virgl is always being
> appended to the list of drivers to be built. Make virgl an optional
> component.
>
>
Please also add it to PACKAGECONFIG defaults for the target then, as we do
rely on it being enabled by default in testing.

Alex

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

✗ patchtest: failure for mesa: Allow building the virgl driver to be configurable

[Patchwork]

== Series Details ==

Series: mesa: Allow building the virgl driver to be configurable
Revision: 1
URL   : https://patchwork.openembedded.org/series/21705/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] 
  Suggested fix    Create the series again using git-format-patch and ensure it can be applied using git am
  Diff line        GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"


* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at d6c62cc030)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe