summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-05-20 12:41:37 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2019-06-06 19:04:14 -0400
commit184857a52ecc9b7088021d7362c7d85e1c3551d6 (patch)
tree26c9a1ab3f41bb566c523d99c8b3035fd9129ff9
parent99ff2a13b3f2666e39c6e845c51c402d01350151 (diff)
downloadmeta-selinux-184857a52ecc9b7088021d7362c7d85e1c3551d6.tar.gz
mesa: switch to meson build
The mesa had been converted to use meson build system in oe-core commit c72b6d46d392bfbcf54154f43663a7a8ada8c567. Update the bbappend to adapt it. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-graphics/mesa/mesa_%.bbappend2
-rw-r--r--recipes-graphics/mesa/mesa_selinux.inc6
2 files changed, 1 insertions, 7 deletions
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index b0b03ec..02c4918 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,2 +1,2 @@
1require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} 1inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)}
2 2
diff --git a/recipes-graphics/mesa/mesa_selinux.inc b/recipes-graphics/mesa/mesa_selinux.inc
deleted file mode 100644
index 0004f71..0000000
--- a/recipes-graphics/mesa/mesa_selinux.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1inherit enable-selinux
2
3# But wait! There's more! mesa builds a host program named builtin_compiler
4# and it needs selinux, too. We replace the PACKAGECONFIG[] in the bbclass.
5#
6PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux libselinux-native,"