Re: [yocto] [meta-selinux][PATCH] glib-2.0: fix configure error for meson build

2019-06-12 Thread Yi Zhao


On 6/12/19 6:03 PM, Alexander Kanavin wrote:
On Wed, 12 Jun 2019 at 09:54, Yi Zhao > 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
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


Re: [yocto] [meta-selinux][PATCH] glib-2.0: fix configure error for meson build

2019-06-12 Thread Alexander Kanavin
On Wed, 12 Jun 2019 at 09:54, Yi Zhao  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
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-selinux][PATCH] glib-2.0: fix configure error for meson build

2019-06-12 Thread Yi Zhao
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 
---
 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 000..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

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto