[meta-selinux][warrior][PATCH 1/2] Revert "mesa: switch to meson build"


Yi Zhao
 

This reverts commit 184857a52ecc9b7088021d7362c7d85e1c3551d6.

The mesa hasn't switched to meson build in this branch.

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-graphics/mesa/mesa_%.bbappend | 2 +-
recipes-graphics/mesa/mesa_selinux.inc | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 recipes-graphics/mesa/mesa_selinux.inc

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 02c4918..b0b03ec 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,2 +1,2 @@
-inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)}
+require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}

diff --git a/recipes-graphics/mesa/mesa_selinux.inc b/recipes-graphics/mesa/mesa_selinux.inc
new file mode 100644
index 0000000..0004f71
--- /dev/null
+++ b/recipes-graphics/mesa/mesa_selinux.inc
@@ -0,0 +1,6 @@
+inherit enable-selinux
+
+# But wait! There's more! mesa builds a host program named builtin_compiler
+# and it needs selinux, too. We replace the PACKAGECONFIG[] in the bbclass.
+#
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux libselinux-native,"
--
2.17.1

Join yocto@lists.yoctoproject.org to automatically receive all group messages.