* [meta-selinux][PATCH] glib-2.0: fix configure error for meson build
@ 2019-06-12 7:53 Yi Zhao
2019-06-12 10:03 ` Alexander Kanavin
0 siblings, 1 reply; 3+ messages in thread
From: Yi Zhao @ 2019-06-12 7:53 UTC (permalink / raw)
To: yocto, Joe_MacDonald
In glib 2.60.x, it turns selinux into a meson feature. We should use
'-Dselinux=enabled/disabled' rather than '-Dselinux=true/false' to
enable/disable the feature.
Add meso-enable-selinux.bbclass for this change and inherit it in
glib-2.0 bbappend to fix the configure error.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
classes/meson-enable-selinux.bbclass | 4 ++++
recipes-core/glib-2.0/glib-2.0_%.bbappend | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 classes/meson-enable-selinux.bbclass
diff --git a/classes/meson-enable-selinux.bbclass b/classes/meson-enable-selinux.bbclass
new file mode 100644
index 0000000..91c2a2b
--- /dev/null
+++ b/classes/meson-enable-selinux.bbclass
@@ -0,0 +1,4 @@
+inherit selinux
+
+PACKAGECONFIG_append = " ${@target_selinux(d)}"
+PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
diff --git a/recipes-core/glib-2.0/glib-2.0_%.bbappend b/recipes-core/glib-2.0/glib-2.0_%.bbappend
index e5d2f6f..39a0a3a 100644
--- a/recipes-core/glib-2.0/glib-2.0_%.bbappend
+++ b/recipes-core/glib-2.0/glib-2.0_%.bbappend
@@ -1 +1 @@
-inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)}
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-enable-selinux', '', d)}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-selinux][PATCH] glib-2.0: fix configure error for meson build
2019-06-12 7:53 [meta-selinux][PATCH] glib-2.0: fix configure error for meson build Yi Zhao
@ 2019-06-12 10:03 ` Alexander Kanavin
2019-06-13 0:06 ` Yi Zhao
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Kanavin @ 2019-06-12 10:03 UTC (permalink / raw)
To: Yi Zhao; +Cc: Yocto discussion list
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
On Wed, 12 Jun 2019 at 09:54, Yi Zhao <yi.zhao@windriver.com> wrote:
> +PACKAGECONFIG[selinux] =
> "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
>
This line should probably go into the oe-core recipe? It is fine to have
options that depend on things absent in oe-core, as long as those options
are disabled by default.
Alex
[-- Attachment #2: Type: text/html, Size: 655 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-selinux][PATCH] glib-2.0: fix configure error for meson build
2019-06-12 10:03 ` Alexander Kanavin
@ 2019-06-13 0:06 ` Yi Zhao
0 siblings, 0 replies; 3+ messages in thread
From: Yi Zhao @ 2019-06-13 0:06 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Yocto discussion list
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
On 6/12/19 6:03 PM, Alexander Kanavin wrote:
> On Wed, 12 Jun 2019 at 09:54, Yi Zhao <yi.zhao@windriver.com
> <mailto:yi.zhao@windriver.com>> wrote:
>
> +PACKAGECONFIG[selinux] =
> "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
>
>
> This line should probably go into the oe-core recipe? It is fine to
> have options that depend on things absent in oe-core, as long as those
> options are disabled by default.
Thanks. I will test it and send a patch to oe-core
//Yi
>
> Alex
[-- Attachment #2: Type: text/html, Size: 1776 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-13 0:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12 7:53 [meta-selinux][PATCH] glib-2.0: fix configure error for meson build Yi Zhao
2019-06-12 10:03 ` Alexander Kanavin
2019-06-13 0:06 ` Yi Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.