fwupd: update to v2.1.1

* See changes (was v2.0.1): https://github.com/fwupd/fwupd/releases

Signed-off-by: Martin Neumann <redacted>

diff --git a/utils/fwupd/Config.in b/utils/fwupd/Config.in
index ff4a631987a4f75cc114181c42d24226c99d7e15..12da3c479142b9c98ca92734cf0f9dfd88c43102 100644 (file)
--- a/utils/fwupd/Config.in
+++ b/utils/fwupd/Config.in
@@ -25,24 +25,6 @@ config FWUPD_CBOR
        help
          Compile fwupd with cbor protocol support
 
-config FWUPD_LZMA
-       bool "LZMA"
-       default n
-       help
-         Compile fwupd with LZMA support
-
-config FWUPD_CURL
-       bool "curl"
-       default n
-       help
-         Compile fwupd with curl support
-
-config FWUPD_LIBARCHIVE
-       bool "libarchive"
-       default y
-       help
-         Compile fwupd with libarchive support
-
 config FWUPD_LIBDRM
        bool "libdrm"
        default n
@@ -55,10 +37,10 @@ config FWUPD_PLUGIN_MODEMMANAGER
        help
          Compile fwupd with ModemManager plugin
 
-config FWUPD_PLUGIN_FASTBOOT
-       bool "fastboot plugin"
+config FWUPD_PLUGIN_FLASHROM
+       bool "flashrom plugin"
        default y
        help
-         Compile fwupd with fastboot plugin
+         Compile fwupd with flashrom plugin
 
 endmenu

diff --git a/utils/fwupd/Makefile b/utils/fwupd/Makefile
index ec78687352cb1a2877ec8ea4102dfae6b4df9589..51bce671bd605f0039805bf29a7a7292b7a35c6b 100644 (file)
--- a/utils/fwupd/Makefile
+++ b/utils/fwupd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fwupd
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/fwupd/fwupd/releases/download/$(PKG_VERSION)
-PKG_HASH:=04226d0c689a56cc51de017e736f18f1f5e951b9a7c1b18e3281eb923c435891
+PKG_HASH:=0ae697f1f2011571310cef5d96429d8a5d541f73b0025bd2b622c9c7f4fe05b6
 
 PKG_MAINTAINER:=Lukas Voegl <lvoegl@tdt.de>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -43,11 +43,12 @@ define Package/fwupd/Default
        +libjcat \
        +libprotobuf-c \
        +libusb-1.0 \
-       +FWUPD_LIBARCHIVE:libarchive \
+       +libsqlite3 \
+       +libcurl \
+       +liblzma \
+       +FWUPD_PLUGIN_FLASHROM:libflashrom \
        +FWUPD_LIBDRM:libdrm \
        +FWUPD_CBOR:libcbor \
-       +FWUPD_LZMA:liblzma \
-       +FWUPD_CURL:libcurl \
        +FWUPD_PLUGIN_MODEMMANAGER:modemmanager \
        +FWUPD_PLUGIN_MODEMMANAGER:libqmi \
        +FWUPD_PLUGIN_MODEMMANAGER:libmbim
@@ -95,73 +96,40 @@ define Package/fwupd-daemon/description
 endef
 
 MESON_ARGS += \
-       -Db_lto=true \
-       -Dbuild=all \
-       -Dpython=$(HOST_PYTHON3_BIN) \
-       -Dsupported_build=enabled \
-       -Dstatic_analysis=false \
-       -Dtests=false \
-       -Dmetainfo=false \
        -Dbash_completion=false \
-       -Dfish_completion=false \
-       -Dman=false \
-       -Dconsolekit=disabled \
-       -Ddocs=disabled \
-       -Dintrospection=disabled \
+       -Dblkid=disabled \
        -Dbluez=disabled \
-       -Dvendor_ids_dir=/usr/share/hwdata \
-       -Dpolkit=disabled \
-       -Dgnutls=disabled \
-       -Dpassim=disabled \
-       -Dsqlite=disabled \
-       -Dudev=enabled \
-       -Dplugin_acpi_phat=disabled \
-       -Dplugin_amdgpu=disabled \
-       -Dplugin_android_boot=disabled \
-       -Dplugin_bcm57xx=disabled \
-       -Dplugin_cfu=disabled \
-       -Dplugin_cpu=disabled \
-       -Dplugin_emmc=disabled \
-       -Dplugin_ep963x=disabled \
-       -Dplugin_gpio=disabled \
-       -Dplugin_igsc=disabled \
-       -Dplugin_kinetic_dp=disabled \
-       -Dplugin_logitech_bulkcontroller=disabled \
-       -Dplugin_logitech_scribe=disabled \
-       -Dplugin_logitech_tap=disabled \
-       -Dplugin_parade_lspcon=disabled \
-       -Dplugin_pixart_rf=disabled \
-       -Dplugin_realtek_mst=disabled \
-       -Dplugin_synaptics_mst=disabled \
-       -Dplugin_mediatek_scaler=disabled \
-       -Dplugin_synaptics_rmi=disabled \
-       -Dplugin_scsi=disabled \
-       -Dplugin_tpm=disabled \
-       -Dplugin_redfish=disabled \
-       -Dplugin_uefi_capsule=disabled \
-       -Dplugin_uefi_pk=disabled \
-       -Dplugin_nitrokey=disabled \
-       -Dplugin_nvme=disabled \
-       -Dplugin_msr=disabled \
-       -Dplugin_mtd=disabled \
-       -Dplugin_flashrom=disabled \
-       -Dplugin_intel_me=disabled \
-       -Dplugin_uf2=disabled \
-       -Dplugin_upower=disabled \
-       -Dplugin_powerd=disabled \
-       -Dsystemd=disabled \
-       -Dlaunchd=disabled \
-       -Delogind=disabled \
+       -Dbuild=all \
+       -Dcbor=$(if $(CONFIG_FWUPD_CBOR),enabled,disabled) \
+       -Ddocs=disabled \
        -Dfirmware-packager=$(if $(CONFIG_FWUPD_FIRMWARE_PACKAGER),true,false) \
+       -Dfish_completion=false \
+       -Dgnutls=disabled \
        -Dhsi=$(if $(CONFIG_FWUPD_HSI),enabled,disabled) \
-       -Dlvfs=$(if $(CONFIG_FWUPD_LVFS),true,false) \
-       -Dcbor=$(if $(CONFIG_FWUPD_CBOR),enabled,disabled) \
-       -Dlzma=$(if $(CONFIG_FWUPD_LZMA),enabled,disabled) \
-       -Dcurl=$(if $(CONFIG_FWUPD_CURL),enabled,disabled) \
-       -Dlibarchive=$(if $(CONFIG_FWUPD_LIBARCHIVE),enabled,disabled) \
+       -Dintrospection=disabled \
        -Dlibdrm=$(if $(CONFIG_FWUPD_LIBDRM),enabled,disabled) \
+       -Dlibmnl=disabled \
+       -Dlogind=disabled \
+       -Dlvfs=$(if $(CONFIG_FWUPD_LVFS),true,false) \
+       -Dman=false \
+       -Dmetainfo=false \
+       -Dudev_hotplug=false \
+       -Dpassim=disabled \
+       -Dplugin_flashrom=$(if $(CONFIG_FWUPD_PLUGIN_FLASHROM),enabled,disabled) \
        -Dplugin_modem_manager=$(if $(CONFIG_FWUPD_PLUGIN_MODEMMANAGER),enabled,disabled) \
-       -Dplugin_fastboot=$(if $(CONFIG_FWUPD_PLUGIN_FASTBOOT),enabled,disabled)
+       -Dplugin_uefi_capsule_splash=false \
+       -Dpolkit=disabled \
+       -Dpython=$(HOST_PYTHON3_BIN) \
+       -Dqubes=false \
+       -Dreadline=disabled \
+       -Dstatic_analysis=false \
+       -Dsupported_build=enabled \
+       -Dsystemd=disabled \
+       -Dtests=false \
+       -Dumockdev_tests=disabled \
+       -Dvalgrind=disabled \
+       -Dvendor_ids_dir=/usr/share/hwdata \
+       -Dvendor_metadata=false
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/fwupd-3