diff options
| author | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2024-10-30 21:53:31 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-10-30 15:57:12 -0700 |
| commit | ec67268d5e74cf4774f842e63bc00139d327e457 (patch) | |
| tree | 6740538bbddff8dcead59d193387ef1d94f12676 | |
| parent | 0f692c3ab76f6a13418f354c7c13b3cbf6130186 (diff) | |
| download | meta-openembedded-ec67268d5e74cf4774f842e63bc00139d327e457.tar.gz | |
libgpiod: selectively enable GObject introspection
The oe-core bbclass for GObject introspection sets GI_DATA_ENABLED if
the relevant distro feature is enabled. That means that it's up to the
inheriting recipe to disable it if needed.
For libgpiod: we only want to enable it if any of the GLib based
packages is being generated (GLib bindings, D-Bus daemon or ptest).
This also effectively reverts commit 78a332939f8b (libgpiod_2.2: depend
on glib-2.0) which indiscriminately pulls in GLib for all packages
generated by this recipe which feels like shooting a fly with a cannon.
Fixes: 9626e8a2c8f2 ("libgpiod: update to v2.2")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb index 00252dfe64..8d8a2cc3a4 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb | |||
| @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ | 9 | file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | DEPENDS += "glib-2.0" | ||
| 13 | |||
| 14 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" | 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" |
| 15 | 13 | ||
| 16 | SRC_URI += "file://gpio-manager.init" | 14 | SRC_URI += "file://gpio-manager.init" |
| @@ -59,6 +57,10 @@ python __anonymous() { | |||
| 59 | d.setVar("SYSTEMD_SERVICE:{}-manager".format(pn), "gpio-manager.service") | 57 | d.setVar("SYSTEMD_SERVICE:{}-manager".format(pn), "gpio-manager.service") |
| 60 | else: | 58 | else: |
| 61 | d.appendVar("EXTRA_OECONF", " --disable-systemd") | 59 | d.appendVar("EXTRA_OECONF", " --disable-systemd") |
| 60 | |||
| 61 | # Disable gobject introspection set by the bbclass if we don't want it. | ||
| 62 | if not any(cfg in ["glib", "dbus", "ptest"] for cfg in packageconfig): | ||
| 63 | d.setVar("GI_DATA_ENABLED", "False") | ||
| 62 | } | 64 | } |
| 63 | 65 | ||
| 64 | UPDATERCPN = "${PN}-manager" | 66 | UPDATERCPN = "${PN}-manager" |
