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

Submitted by Yi Zhao on June 12, 2019, 7:53 a.m. | Patch ID: 162143

Details

Message ID 1560326000-21130-1-git-send-email-yi.zhao@windriver.com
State New
Headers show

Commit Message

Yi Zhao June 12, 2019, 7:53 a.m.
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

Patch hide | download patch | download mbox

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)}

Comments

Alexander Kanavin June 12, 2019, 10:03 a.m.
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
Yi Zhao June 13, 2019, 12:06 a.m.
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