From e6f62b8e639a79626d95568c070a410c24bce25e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 16 Jul 2021 16:09:05 +0100 Subject: meta: remove redundant ${libdir}/cmake from FILES_${PN}-dev Since oe-core 543e39ad "bitbake.conf: handle cmake -dev files packaging with default rules" (June 2018) there's no need for recipes to add ${libdir}/cmake or ${datadir}/cmake to FILES_${PN}-dev themselves. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni --- meta/recipes-core/dbus/dbus_1.12.20.bb | 2 +- meta/recipes-core/libxml/libxml2_2.9.12.bb | 2 +- meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | 1 - meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb | 2 -- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- meta/recipes-support/bash-completion/bash-completion_2.11.bb | 2 -- meta/recipes-support/gpgme/gpgme_1.16.0.bb | 4 +--- 7 files changed, 4 insertions(+), 11 deletions(-) diff --git a/meta/recipes-core/dbus/dbus_1.12.20.bb b/meta/recipes-core/dbus/dbus_1.12.20.bb index 32e7d9cfa3..2f6da67510 100644 --- a/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/meta/recipes-core/dbus/dbus_1.12.20.bb @@ -71,7 +71,7 @@ FILES_${PN}-tools = "${bindir}/dbus-uuidgen \ " FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${libdir}/cmake/DBus1 ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" pkg_postinst_dbus() { diff --git a/meta/recipes-core/libxml/libxml2_2.9.12.bb b/meta/recipes-core/libxml/libxml2_2.9.12.bb index 955d934d7d..2d1e92966f 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.12.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.12.bb @@ -67,7 +67,7 @@ PACKAGE_BEFORE_PN += "${PN}-utils" PACKAGES += "${PN}-python" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" +FILES_${PN}-dev += "${libdir}/xml2Conf.sh" FILES_${PN}-utils = "${bindir}/*" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 3b308318b2..23cd25986e 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -48,7 +48,6 @@ do_install_append () { } FILES_${PN} += "${datadir}/sgml" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-doc = "" SYSROOT_PREPROCESS_FUNCS_append_class-native = " gtkdoc_makefiles_sysroot_preprocess" diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb index 54556abb27..3aac32159a 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb @@ -76,6 +76,4 @@ do_configure_prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } -FILES_${PN}-dev += "${libdir}/cmake" - BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 2c9e8167c4..4e226c616d 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -182,7 +182,7 @@ FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" -FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" +FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" FILES_${PN}-pa-info = "${bindir}/pa-info" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" diff --git a/meta/recipes-support/bash-completion/bash-completion_2.11.bb b/meta/recipes-support/bash-completion/bash-completion_2.11.bb index 4076535902..67738c3c83 100644 --- a/meta/recipes-support/bash-completion/bash-completion_2.11.bb +++ b/meta/recipes-support/bash-completion/bash-completion_2.11.bb @@ -37,6 +37,4 @@ PACKAGES =+ "${PN}-extra" FILES_${PN}-extra = "${datadir}/${BPN}/completions/ \ ${datadir}/${BPN}/helpers/" -FILES_${PN}-dev += "${datadir}/cmake" - BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-support/gpgme/gpgme_1.16.0.bb b/meta/recipes-support/gpgme/gpgme_1.16.0.bb index 86dd69f0a1..13f456fcfc 100644 --- a/meta/recipes-support/gpgme/gpgme_1.16.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.16.0.bb @@ -72,9 +72,7 @@ PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '' FILES_${PN}-cpp = "${libdir}/libgpgmepp.so.*" FILES_python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" FILES_python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/* \ - ${libdir}/cmake/* \ -" +FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" CFLAGS_append_libc-musl = " -D__error_t_defined " do_configure_prepend () { -- cgit 1.2.3-korg