From 184857a52ecc9b7088021d7362c7d85e1c3551d6 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 20 May 2019 12:41:37 +0800 Subject: 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 Signed-off-by: Joe MacDonald --- recipes-graphics/mesa/mesa_%.bbappend | 2 +- recipes-graphics/mesa/mesa_selinux.inc | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 recipes-graphics/mesa/mesa_selinux.inc 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 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)} 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 @@ -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," -- cgit v1.2.3-54-g00ecf