Replace 0002-meson.build-do-not-install-python-gi-bindings.patch with an explicitly set meson option.
Signed-off-by: Alexander Kanavin <[email protected]> --- ...ld-do-not-install-python-gi-bindings.patch | 23 ------------------- .../libmodulemd/libmodulemd_git.bb | 11 +++++---- 2 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch deleted file mode 100644 index a97fb73907..0000000000 --- a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d7eeac90fe02ccf5c5e4334e41ec75fc33803643 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 31 Mar 2020 16:12:28 +0200 -Subject: [PATCH] meson.build: do not install python gi bindings - -These are unnecessary for oe-core, and the install location -is incorrectly determined using native python. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index a8b02b4..8ff737b 100644 ---- a/meson.build -+++ b/meson.build -@@ -171,4 +171,3 @@ configure_file( - ) - - subdir('modulemd') --subdir('bindings/python') diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index d440e60ee6..fda01b8ad8 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -4,17 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ - file://0002-meson.build-do-not-install-python-gi-bindings.patch \ " -PV = "2.9.2" -SRCREV = "780750eab8a0587b20d033f335301f16d00ab9c9" +PV = "2.9.4" +SRCREV = "c7254db07b21495fc9bd247c5b17ee20149c05e3" S = "${WORKDIR}/git" -inherit meson gobject-introspection +inherit meson gobject-introspection python3-dir -EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled" +EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" @@ -23,3 +22,5 @@ BBCLASSEXTEND = "native nativesdk" GIR_MESON_OPTION = 'skip_introspection' GIR_MESON_ENABLE_FLAG = 'false' GIR_MESON_DISABLE_FLAG = 'true' + +FILES_${PN} += "${libdir}/${PYTHON_DIR}/*" -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138991): https://lists.openembedded.org/g/openembedded-core/message/138991 Mute This Topic: https://lists.openembedded.org/mt/74584223/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
