From: "Yi Zhao" <yi.zhao@windriver.com>
To: <yocto@yoctoproject.org>, <joe@deserted.net>, <Joe_MacDonald@mentor.com>
Cc: <Yair.Itzhaki@docusign.com>
Subject: [meta-selinux][warrior][PATCH 1/2] Revert "mesa: switch to meson build"
Date: Fri, 22 Nov 2019 14:48:35 +0800 [thread overview]
Message-ID: <20191122064836.9993-1-yi.zhao@windriver.com> (raw)
This reverts commit 184857a52ecc9b7088021d7362c7d85e1c3551d6.
The mesa hasn't switched to meson build in this branch.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
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
next reply other threads:[~2019-11-22 6:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 6:48 Yi Zhao [this message]
2019-11-22 6:48 ` [meta-selinux][warrior][PATCH 2/2] refpolicy: fix labels for busybox init.sysvinit and start_getty Yi Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191122064836.9993-1-yi.zhao@windriver.com \
--to=yi.zhao@windriver.com \
--cc=Joe_MacDonald@mentor.com \
--cc=Yair.Itzhaki@docusign.com \
--cc=joe@deserted.net \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox