proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-12 00:14:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make libfwupdplugin an internal library instead

Browse Source 
This drops the requirement on us being so strict on a particular ABI version,
and also more strongly discourages out of tree plugin development.

We should still strive to keep API stable, and as such keep a symbol map still.

Use rpath instead for the static plugins, and set the plugin install directory
to just fwupd-$ABI$ as we're storing more than just plugins here now.
This commit is contained in:
Mario Limonciello 2022-09-27 15:39:49 -05:00 committed by Richard Hughes
parent 6cd0871fcb
commit ec0496b47a
37 changed files with 125 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ci/arch.sh
View File

@ -44,10 +44,6 @@ pacman -S --noconfirm qt5-base
meson qt5-thread-test ../contrib/ci/qt5-thread-test
ninja -C qt5-thread-test test
#run the CI tests for making sure we can link fwupd/fwupdplugin
meson out-of-tree-link ../contrib/ci/out-of-tree-link
ninja -C out-of-tree-link test
# move the package to working dir
mv *.pkg.* ../dist

1
contrib/ci/out-of-tree-link/.gitignore vendored
View File

@ -1 +0,0 @@
build

12
contrib/ci/out-of-tree-link/fwupd.c
View File

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#undef NDEBUG
#include <assert.h>
#include <fwupd.h>
int
main(void)
{
assert(fwupd_error_to_string(FWUPD_ERROR_NOTHING_TO_DO) != NULL);
return 0;
}

13
contrib/ci/out-of-tree-link/fwupdplugin.c
View File

@ -1,13 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#undef NDEBUG
#include <fwupdplugin.h>
#include <assert.h>
int
main(void)
{
assert(fu_version_compare("1.0", "2.1", FWUPD_VERSION_FORMAT_NUMBER) < 0);
return 0;
}

27
contrib/ci/out-of-tree-link/meson.build
View File

@ -1,27 +0,0 @@
project('out-of-tree-link', 'c',
license: 'LGPL-2.1+',
)
fwupd = dependency('fwupd')
fwupdplugin = dependency('fwupdplugin')
env = environment()
env.set('G_DEBUG', 'fatal-criticals')
e = executable(
'fwupd',
sources: [
'fwupd.c'
],
dependencies: [
fwupd
],
)
test('fwupd', e, timeout: 60, env: env)
e = executable(
'fwupdplugin',
sources: [
'fwupdplugin.c'
],
dependencies: [
fwupdplugin
],
)
test('fwupdplugin', e, timeout: 60, env: env)

57
contrib/debian/control.in
View File

@ -14,21 +14,6 @@ Homepage: https://github.com/fwupd/fwupd
Vcs-Git: https://salsa.debian.org/efi-team/fwupd.git
Vcs-Browser: https://salsa.debian.org/efi-team/fwupd
Package: libfwupdplugin7
Section: libs
Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends}
Multi-Arch: same
Description: Firmware update daemon plugin library
fwupd is a daemon to allow session software to update device firmware.
You can either use a GUI software manager like GNOME Software to view and
apply updates, the command-line tool or the system D-Bus interface directly.
Firmware updates are supported for a variety of technologies.
See <https://github.com/fwupd/fwupd> for details
.
This package provides the library for the interface between daemon and plugins.
Package: libfwupd2
Section: libs
Architecture: linux-any
@ -152,44 +137,4 @@ Description: GObject introspection data for libfwupd
This package provides the introspection data for libfwupd.
.
It can be used by packages using the GIRepository format to generate
dynamic bindings.
Package: libfwupdplugin-dev
Architecture: linux-any
Multi-Arch: same
Depends: libfwupdplugin7 (= ${binary:Version}),
gir1.2-fwupdplugin-1.0 (= ${binary:Version}),
libarchive-dev,
libcbor-dev,
libcurl4-gnutls-dev,
libfwupd-dev (= ${binary:Version}),
libgcab-dev,
libglib2.0-dev (>= 2.45.8),
libgudev-1.0-dev,
libgusb-dev (>= 0.3.5),
libjcat-dev,
libjson-glib-dev (>= 1.1.1),
libxmlb-dev (>= 0.1.13),
valgrind [!ia64 !riscv64 !x32 !mips !sparc64 !sh4 !ppc64 !powerpcspe !hppa !alpha !mips64el !armhf !armel !mipsel !m68k],
${misc:Depends}
Section: libdevel
Description: development files for libfwupdplugin
fwupd is a daemon to allow session software to update device firmware.
You can either use a GUI software manager like GNOME Software to view and
apply updates, the command-line tool or the system D-Bus interface directly.
Firmware updates are supported for a variety of technologies.
See <https://github.com/fwupd/fwupd> for details
.
This package provides the development files for libfwupdplugin
Package: gir1.2-fwupdplugin-1.0
Architecture: linux-any
Multi-Arch: same
Depends: ${misc:Depends},
${gir:Depends}
Section: introspection
Description: GObject introspection data for libfwupdplugin
This package provides the introspection data for libfwupdplugin.
.
It can be used by packages using the GIRepository format to generate
dynamic bindings.
dynamic bindings.

2
contrib/debian/fwupd.install
View File

@ -18,6 +18,6 @@ lib/systemd/system-shutdown/*
lib/udev/rules.d/*
data/daemon.conf etc/fwupd
debian/fwupd.pkla /var/lib/polkit-1/localauthority/10-vendor.d
usr/lib/*/fwupd-plugins-*/*.so
usr/lib/*/fwupd-*/*.so
debian/lintian/fwupd usr/share/lintian/overrides
obj*/data/motd/85-fwupd /etc/update-motd.d

1
contrib/debian/gir1.2-fwupdplugin-1.0.install
View File

@ -1 +0,0 @@
usr/lib/*/girepository-1.0/FwupdPlugin-*.typelib

5
contrib/debian/libfwupdplugin-dev.install
View File

@ -1,5 +0,0 @@
usr/include/fwupd-1/fwupdplugin.h
usr/include/fwupd-1/libfwupdplugin
usr/lib/*/libfwupdplugin.so
usr/lib/*/pkgconfig/fwupdplugin.pc
usr/share/gir-1.0/FwupdPlugin-*.gir

1
contrib/debian/libfwupdplugin7.install
View File

@ -1 +0,0 @@
usr/lib/*/libfwupdplugin.so.*

189
contrib/fwupd.spec.in
View File

@ -5,7 +5,7 @@
%global libjcat_version 0.1.0
%global systemd_version 231
%global json_glib_version 1.1.1
%global fwupdplugin_version @FWUPD_PLUGINVER@
%global fwupdplugin_version @FWUPD_VERSION@
# although we ship a few tiny python files these are utilities that 99.99%
# of users do not need -- use this to avoid dragging python onto CoreOS
@ -420,131 +420,130 @@ done
%{_sysconfdir}/grub.d/35_fwupd
%endif
%{_libdir}/libfwupd.so.2*
%{_libdir}/libfwupdplugin.so.%{fwupdplugin_version}*
%{_libdir}/girepository-1.0/Fwupd-2.0.typelib
%{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib
/usr/lib/udev/rules.d/*.rules
/usr/lib/systemd/system-shutdown/fwupd.shutdown
%dir %{_libdir}/fwupd-plugins-%{fwupdplugin_version}
%dir %{_libdir}/fwupd-%{fwupdplugin_version}
%{_libdir}/fwupd-%{fwupdplugin_version}/libfwupdplugin.so
%ifarch i686 x86_64
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_facp.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_acpi_facp.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_phat.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_amt.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_analogix.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_android_boot.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ata.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bcm57xx.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cfu.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ccgx.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ch341a.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_colorhug.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_corsair.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cros_ec.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cpu.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_acpi_phat.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_amt.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_analogix.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_android_boot.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_ata.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_bcm57xx.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_cfu.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_ccgx.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_ch341a.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_colorhug.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_corsair.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_cros_ec.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_cpu.so
%if 0%{?have_dell}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_esrt.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_dell.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_dell_esrt.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_dock.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu_csr.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ebitdo.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elantp.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elanfp.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_emmc.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ep963x.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fastboot.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_focalfp.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fpc.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fresco_pd.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_genesys.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_dell_dock.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_dfu.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_dfu_csr.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_ebitdo.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_elantp.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_elanfp.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_emmc.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_ep963x.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_fastboot.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_focalfp.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_fpc.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_fresco_pd.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_genesys.so
%if 0%{?have_gpio}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_gpio.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_gpio.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_hailuck.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_intel_usb4.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_hailuck.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_intel_usb4.so
%ifarch i686 x86_64
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_iommu.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_iommu.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_jabra.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_jabra.so
%if 0%{?have_uefi}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_lenovo_thinklmi.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_lenovo_thinklmi.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_lockdown.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_linux_lockdown.so
%ifarch i686 x86_64
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_sleep.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_linux_sleep.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_swap.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_tainted.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_linux_swap.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_linux_tainted.so
%if 0%{?have_msr}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_ivrs.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_acpi_ivrs.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_msr.so
%endif
%ifarch i686 x86_64
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_amd_pmc.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_psp.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_amd_pmc.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_pci_psp.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_mtd.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nitrokey.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nordic_hid.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nvme.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_optionrom.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_parade_lspcon.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_bcr.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_mei.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_realtek_mst.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_redfish.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hid.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hub.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_scsi.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_steelseries.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_superio.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_mst.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cape.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cxaudio.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_prometheus.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_rmi.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_system76_launch.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_mtd.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_nitrokey.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_nordic_hid.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_nvme.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_optionrom.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_parade_lspcon.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_pci_bcr.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_pci_mei.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_realtek_mst.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_redfish.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_rts54hid.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_rts54hub.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_scsi.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_steelseries.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_superio.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_synaptics_mst.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_synaptics_cape.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_synaptics_cxaudio.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_synaptics_prometheus.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_synaptics_rmi.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_system76_launch.so
%if 0%{?enable_dummy}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_test.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_test_ble.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_invalid.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_test.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_test_ble.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_invalid.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thelio_io.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_thelio_io.so
%if 0%{?have_thunderbolt}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thunderbolt.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_thunderbolt.so
%endif
%if 0%{?have_uefi}
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_tpm.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bios.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_capsule.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_dbx.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_pk.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_recovery.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_tpm.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_bios.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_uefi_capsule.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_uefi_dbx.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_uefi_pk.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_uefi_recovery.so
%endif
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_usi_dock.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_vbe.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logind.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_bulkcontroller.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_hidpp.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uf2.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_upower.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_vli.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_raw.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_usb.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_goodixmoc.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_usi_dock.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_vbe.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_logind.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_logitech_bulkcontroller.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_logitech_hidpp.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_uf2.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_upower.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_vli.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_wacom_raw.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_wacom_usb.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_goodixmoc.so
%ghost %{_localstatedir}/lib/fwupd/gnupg
%if 0%{?have_modem_manager}
%files plugin-modem-manager
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_modem_manager.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_modem_manager.so
%endif
%if 0%{?have_flashrom}
%files plugin-flashrom
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_flashrom.so
%{_libdir}/fwupd-%{fwupdplugin_version}/libfu_plugin_flashrom.so
%endif
%if 0%{?have_uefi}
%files plugin-uefi-capsule-data
@ -553,7 +552,6 @@ done
%files devel
%{_datadir}/gir-1.0/Fwupd-2.0.gir
%{_datadir}/gir-1.0/FwupdPlugin-1.0.gir
%{_datadir}/doc/fwupd/libfwupdplugin
%{_datadir}/doc/fwupd/libfwupd
%{_datadir}/doc/libfwupdplugin
@ -562,7 +560,6 @@ done
%{_includedir}/fwupd-1
%{_libdir}/libfwupd*.so
%{_libdir}/pkgconfig/fwupd.pc
%{_libdir}/pkgconfig/fwupdplugin.pc
%files tests
%if 0%{?enable_tests}

1
contrib/meson.build
View File

@ -5,7 +5,6 @@ endif
con2 = configuration_data()
con2.set('FWUPD_VERSION', fwupd_version)
con2.set('FWUPD_PLUGINVER', libfwupdplugin_lt_current)
configure_file(
input: 'fwupd.spec.in',

23
libfwupdplugin/meson.build
View File

@ -177,13 +177,6 @@ fwupdplugin_headers = [
'fu-usb-device.h',
'fu-hid-device.h',
]
install_headers(
'fwupdplugin.h',
subdir: 'fwupd-1',
)
install_headers([fwupdplugin_headers, 'fu-plugin-vfuncs.h'],
subdir: 'fwupd-1/libfwupdplugin',
)
fu_hash = custom_target(
'fu-hash.h',
@ -254,8 +247,6 @@ fwupdplugin = library(
fwupdplugin_headers,
fwupdplugin_headers_private,
],
soversion: libfwupdplugin_lt_current,
version: libfwupdplugin_lt_version,
include_directories: [
root_incdir,
fwupd_incdir,
@ -268,20 +259,10 @@ fwupdplugin = library(
],
link_args: cc.get_supported_link_arguments([vflag]),
link_depends: fwupdplugin_mapfile,
install_dir: plugin_dir,
install: true
)
fwupdplugin_pkgg = import('pkgconfig')
fwupdplugin_pkgg.generate(
libraries: fwupdplugin,
requires: pkgg_requires,
subdirs: 'fwupd-1',
version: meson.project_version(),
name: 'fwupdplugin',
filebase: 'fwupdplugin',
description: 'library for plugins to use to interact with fwupd daemon',
)
if introspection.allowed()
gir_dep = declare_dependency(sources: fwupd_gir)
girtargets = []
@ -328,7 +309,7 @@ if introspection.allowed()
girtargets,
fwupd_gir[0],
],
install: true
install: false
)
# Verify the map file is correct -- note we can't actually use the generated

8
meson.build
View File

@ -52,10 +52,6 @@ libfwupd_lt_current = '2'
libfwupd_lt_revision = '0'
libfwupd_lt_age = '0'
libfwupd_lt_version = '@0@.@1@.@2@'.format(libfwupd_lt_current, libfwupd_lt_age, libfwupd_lt_revision)
libfwupdplugin_lt_current = '7'
libfwupdplugin_lt_revision = '0'
libfwupdplugin_lt_age = '0'
libfwupdplugin_lt_version = '@0@.@1@.@2@'.format(libfwupdplugin_lt_current, libfwupdplugin_lt_age, libfwupdplugin_lt_revision)
# get supported warning flags
warning_flags = [
@ -504,9 +500,9 @@ conf.set_quoted('FWUPD_LOCALEDIR', localedir)
if build_standalone
if host_machine.system() == 'windows'
plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)
plugin_dir = 'fwupd-@0@'.format(fwupd_version)
else
plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current))
plugin_dir = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version))
endif
conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir)
endif

1
plugins/acpi-dmar/meson.build
View File

@ -48,6 +48,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('acpi-dmar-self-test', e, env: env) # added to installed-tests

1
plugins/acpi-facp/meson.build
View File

@ -48,6 +48,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('acpi-facp-self-test', e, env: env) # added to installed-tests

1
plugins/acpi-ivrs/meson.build
View File

@ -48,6 +48,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('acpi-ivrs-self-test', e, env: env) # added to installed-tests

1
plugins/acpi-phat/meson.build
View File

@ -54,6 +54,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('acpi-phat-self-test', e, env: env) # added to installed-tests

1
plugins/ata/meson.build
View File

@ -54,6 +54,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('ata-self-test', e, env: env) # added to installed-tests

1
plugins/bcm57xx/meson.build
View File

@ -64,6 +64,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('bcm57xx-self-test', e, env: env)

1
plugins/ccgx/meson.build
View File

@ -67,6 +67,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('ccgx-self-test', e, env: env)

1
plugins/dfu/meson.build
View File

@ -115,6 +115,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('fu-dfu-self-test', e, env: env) # added to installed-tests

1
plugins/elantp/meson.build
View File

@ -58,6 +58,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('elantp-self-test', e, env: env)

1
plugins/linux-swap/meson.build
View File

@ -45,6 +45,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('linux-swap-self-test', e) # added to installed-tests

1
plugins/mtd/meson.build
View File

@ -47,6 +47,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('mtd-self-test', e) # added to installed-tests

1
plugins/nitrokey/meson.build
View File

@ -48,6 +48,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('nitrokey-self-test', e) # added to installed-tests

1
plugins/nvme/meson.build
View File

@ -60,6 +60,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('nvme-self-test', e, env: env) # added to installed-tests

1
plugins/pixart-rf/meson.build
View File

@ -56,6 +56,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('pxi-self-test', e, env: env)

1
plugins/redfish/meson.build
View File

@ -91,6 +91,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('redfish-self-test', e, env: env) # added to installed-tests

1
plugins/synaptics-mst/meson.build
View File

@ -67,6 +67,7 @@ if get_option('tests')
cargs,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('synaptics-mst-self-test', e, env: env)

1
plugins/synaptics-prometheus/meson.build
View File

@ -59,6 +59,7 @@ if get_option('tests')
],
c_args: cargs,
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('synaptics-prometheus-self-test', e, env: env) # added to installed-tests

1
plugins/synaptics-rmi/meson.build
View File

@ -63,6 +63,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('synaptics-rmi-self-test', e, env: env)

1
plugins/uefi-dbx/meson.build
View File

@ -54,6 +54,7 @@ if get_option('tests')
],
c_args: cargs,
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('uefi-dbx-self-test', e, env: env) # added to installed-tests

1
plugins/uf2/meson.build
View File

@ -55,6 +55,7 @@ if get_option('tests')
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('uf2-self-test', e, env: env)

1
plugins/vli/meson.build
View File

@ -67,6 +67,7 @@ if get_option('tests')
],
c_args: cargs,
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('vli-self-test', e) # added to installed-tests

1
plugins/wacom-usb/meson.build
View File

@ -61,6 +61,7 @@ if get_option('tests')
],
c_args: cargs,
install: true,
install_rpath: plugin_dir,
install_dir: installed_test_bindir,
)
test('wacom-usb-self-test', e, env: env) # added to installed-tests

4
src/meson.build
View File

@ -105,6 +105,7 @@ fwupdmgr = executable(
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: bindir
)
@ -144,6 +145,7 @@ fwupdoffline = executable(
fwupdplugin,
],
install: true,
install_rpath: plugin_dir,
install_dir: join_paths(libexecdir, 'fwupd')
)
endif
@ -185,6 +187,7 @@ fwupdtool = executable(
fwupdplugin
],
install: true,
install_rpath: plugin_dir,
install_dir: bindir
)
@ -252,6 +255,7 @@ executable(
'-DFU_OFFLINE_DESTDIR=""',
],
install: true,
install_rpath: plugin_dir,
install_dir: daemon_dir
)