From fe5649f379878c1acac97c15060dfdfee17958ac Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 7 Nov 2024 15:24:13 +0100 Subject: [PATCH] fwupd: bump to 2.0.1 and make libdrm support configurable Bump fwupd to 2.0.1 and make libdrm support configurable. Set libdrm support disabled by default. This is needed to fix a problem with buildbot where libdrm dependency is silently included as buildbot compile every package and library is found in the system. Signed-off-by: Christian Marangi --- utils/fwupd/Config.in | 6 ++++++ utils/fwupd/Makefile | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/utils/fwupd/Config.in b/utils/fwupd/Config.in index f975b962f1..ff4a631987 100644 --- a/utils/fwupd/Config.in +++ b/utils/fwupd/Config.in @@ -43,6 +43,12 @@ config FWUPD_LIBARCHIVE help Compile fwupd with libarchive support +config FWUPD_LIBDRM + bool "libdrm" + default n + help + Compile fwupd with libdrm support + config FWUPD_PLUGIN_MODEMMANAGER bool "ModemManager plugin" default y diff --git a/utils/fwupd/Makefile b/utils/fwupd/Makefile index 0fad4de01e..ec78687352 100644 --- a/utils/fwupd/Makefile +++ b/utils/fwupd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fwupd -PKG_VERSION:=2.0.0 +PKG_VERSION:=2.0.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:=60a62b850e2c3a818f3178cb1de0f632b1e04c6ab07c02483af398940713548a +PKG_HASH:=04226d0c689a56cc51de017e736f18f1f5e951b9a7c1b18e3281eb923c435891 PKG_MAINTAINER:=Lukas Voegl PKG_LICENSE:=LGPL-2.1-or-later @@ -44,6 +44,7 @@ define Package/fwupd/Default +libprotobuf-c \ +libusb-1.0 \ +FWUPD_LIBARCHIVE:libarchive \ + +FWUPD_LIBDRM:libdrm \ +FWUPD_CBOR:libcbor \ +FWUPD_LZMA:liblzma \ +FWUPD_CURL:libcurl \ @@ -158,6 +159,7 @@ MESON_ARGS += \ -Dlzma=$(if $(CONFIG_FWUPD_LZMA),enabled,disabled) \ -Dcurl=$(if $(CONFIG_FWUPD_CURL),enabled,disabled) \ -Dlibarchive=$(if $(CONFIG_FWUPD_LIBARCHIVE),enabled,disabled) \ + -Dlibdrm=$(if $(CONFIG_FWUPD_LIBDRM),enabled,disabled) \ -Dplugin_modem_manager=$(if $(CONFIG_FWUPD_PLUGIN_MODEMMANAGER),enabled,disabled) \ -Dplugin_fastboot=$(if $(CONFIG_FWUPD_PLUGIN_FASTBOOT),enabled,disabled) -- 2.30.2