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

Make Upower and powerd support optional

Browse Source 
In some cases you really know that the daemon is never going to exist.
This commit is contained in:
Richard Hughes 2021-11-27 13:22:37 +00:00
parent 3ad283fc50
commit 3291bd40ce
9 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/PKGBUILD
View File

@ -29,6 +29,7 @@ build() {
fi fi
arch-meson -D b_lto=false $CI ../build \ arch-meson -D b_lto=false $CI ../build \
-Dplugin_intel_spi=true \ -Dplugin_intel_spi=true \
-Dplugin_powerd=false \
-Dlzma=true \ -Dlzma=true \
-Ddocs=gtkdoc \ -Ddocs=gtkdoc \
-Defi_binary=false \ -Defi_binary=false \

2
contrib/ci/build_windows.sh
View File

@ -43,6 +43,8 @@ meson .. \
-Dplugin_thunderbolt=false \ -Dplugin_thunderbolt=false \
-Dplugin_synaptics_mst=false \ -Dplugin_synaptics_mst=false \
-Dplugin_synaptics_rmi=false \ -Dplugin_synaptics_rmi=false \
-Dplugin_upower=false \
-Dplugin_powerd=false \
-Dman=false \ -Dman=false \
-Dmetainfo=false \ -Dmetainfo=false \
-Dsoup_session_compat=false \ -Dsoup_session_compat=false \

1
contrib/ci/debian_s390x.sh
View File

@ -24,6 +24,7 @@ meson .. \
-Dplugin_msr=false \ -Dplugin_msr=false \
-Dplugin_mtd=false \ -Dplugin_mtd=false \
-Dplugin_redfish=false \ -Dplugin_redfish=false \
-Dplugin_powerd=false \
-Dintrospection=false \ -Dintrospection=false \
-Ddocs=none \ -Ddocs=none \
-Dlibxmlb:introspection=false \ -Dlibxmlb:introspection=false \

2
contrib/debian/rules
View File

@ -44,7 +44,7 @@ ifneq ($(QUBES_OPTION),)
CONFARGS += -Dqubes=true CONFARGS += -Dqubes=true
endif endif
CONFARGS += -Dplugin_dummy=true -Ddocs=gtkdoc -Dsupported_build=true CONFARGS += -Dplugin_dummy=true -Dplugin_powerd=false -Ddocs=gtkdoc -Dsupported_build=true
%: %:
dh $@ --with gir dh $@ --with gir

2
contrib/fwupd.spec.in
View File

@ -278,6 +278,7 @@ fwupd wrapper for Qubes OS
%endif %endif
-Dman=true \ -Dman=true \
-Dbluez=true \ -Dbluez=true \
-Dplugin_powerd=false \
-Dsupported_build=true -Dsupported_build=true
%meson_build %meson_build
@ -454,7 +455,6 @@ done
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_bcr.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_pci_mei.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_powerd.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_realtek_mst.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_redfish.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hid.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hid.so

2
meson_options.txt
View File

@ -36,6 +36,8 @@ option('plugin_mtd', type : 'boolean', value : true, description : 'enable MTD s
option('plugin_flashrom', type : 'boolean', value : false, description : 'enable libflashrom support') option('plugin_flashrom', type : 'boolean', value : false, description : 'enable libflashrom support')
option('plugin_platform_integrity', type : 'boolean', value : false, description : 'enable platform integrity support') option('plugin_platform_integrity', type : 'boolean', value : false, description : 'enable platform integrity support')
option('plugin_intel_spi', type : 'boolean', value : false, description : 'enable Intel SPI support') option('plugin_intel_spi', type : 'boolean', value : false, description : 'enable Intel SPI support')
option('plugin_upower', type : 'boolean', value : true, description : 'enable support for UPower')
option('plugin_powerd', type : 'boolean', value : true, description : 'enable support for powerd')
option('qubes', type : 'boolean', value : false, description : 'build packages for Qubes OS') option('qubes', type : 'boolean', value : false, description : 'build packages for Qubes OS')
option('supported_build', type : 'boolean', value : false, description: 'distribution package with upstream support') option('supported_build', type : 'boolean', value : false, description: 'distribution package with upstream support')
option('systemd', type : 'boolean', value : true, description : 'enable systemd support') option('systemd', type : 'boolean', value : true, description : 'enable systemd support')

2
plugins/powerd/meson.build
View File

@ -1,4 +1,4 @@
if host_machine.system() == 'linux' and gio.version().version_compare('>=2.58') if get_option('plugin_powerd') and host_machine.system() == 'linux' and gio.version().version_compare('>=2.58')
cargs = ['-DG_LOG_DOMAIN="FuPluginPowerd"'] cargs = ['-DG_LOG_DOMAIN="FuPluginPowerd"']
shared_module('fu_plugin_powerd', shared_module('fu_plugin_powerd',

2
plugins/upower/meson.build
View File

@ -1,4 +1,4 @@
if host_machine.system() == 'linux' if get_option('plugin_upower') and host_machine.system() == 'linux'
cargs = ['-DG_LOG_DOMAIN="FuPluginUpower"'] cargs = ['-DG_LOG_DOMAIN="FuPluginUpower"']
shared_module('fu_plugin_upower', shared_module('fu_plugin_upower',

1
snap/snapcraft.yaml
View File

@ -175,6 +175,7 @@ parts:
-Dintrospection=false, -Dintrospection=false,
-Dman=false, -Dman=false,
-Dplugin_modem_manager=true, -Dplugin_modem_manager=true,
-Dplugin_powerd=false,
-Dudevdir=$SNAPCRAFT_STAGE/lib/udev, -Dudevdir=$SNAPCRAFT_STAGE/lib/udev,
"-Dgusb:tests=false", "-Dgusb:tests=false",
"-Dgusb:docs=false", "-Dgusb:docs=false",