Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88596C02183 for ; Sat, 18 Jan 2025 01:23:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8015284C1C; Sat, 18 Jan 2025 01:23:31 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id b9MiicxbQyLG; Sat, 18 Jan 2025 01:23:30 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 17BB784C1D Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id 17BB784C1D; Sat, 18 Jan 2025 01:23:30 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id 9329F94B for ; Sat, 18 Jan 2025 01:23:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 615BD6FB8C for ; Sat, 18 Jan 2025 01:23:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id AxBjkzGW0Qd4 for ; Sat, 18 Jan 2025 01:23:27 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::133; helo=mail-il1-x133.google.com; envelope-from=james.hilliard1@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 077DE6FB86 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 077DE6FB86 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by smtp3.osuosl.org (Postfix) with ESMTPS id 077DE6FB86 for ; Sat, 18 Jan 2025 01:23:26 +0000 (UTC) Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-3ce913bc580so9205935ab.2 for ; Fri, 17 Jan 2025 17:23:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737163406; x=1737768206; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IiilQwdhWfC4tyxXRUrOsO0/GoDds0vpOMK5bDCQAZo=; b=h6LUNop1QjCIIpDf1kT427B4LwxCfg3oSuY9kUkF29hME+d3ahgyMGHk4sxZCpFZb+ 57heXpsW+bqMuuG+CJ25qeJoAJsDj1FLJJIGW3q68+2G42xcoYzy8OdJed2jwpBuJ8JK tkpXc+duoxhqY3R0LHw4zDaXweaGjkFOON/zbNSEG08TgS2qpUuSj3nKclw/Eol0inpP Uuh5zS4Wt9o6DnyTOOVLuY9GeXT8RQ64KLUG9TaNX1+HeSL9WfO5+L0sK2s9Kg3gcssO bC200WesFH3kk3FpYMoMEgKeS5/v5Z8jxRSoPF5vizfjUds2jdQevXLd28PLG8JkF/bU 8l3A== X-Gm-Message-State: AOJu0YzRUNzzhzbDq8/m6mO5dDTH6eOTObAkT0MDnyoyCdm1MUrrOu08 696Bv9vQsKY0+VRC8vCpY3/DtgpTV509Ct4uZocJ0SsH9vn91Q9bV0jY2jAM X-Gm-Gg: ASbGncvNuwbZ8xh73cOCi/WdRcdJwPZJkyPhbmIRJOTtuVyIixufxt9Y41m8YOEe0R1 edxOIltwxOn72rFItrZhr/q4/AFvP0EcdJmkUS4vJFd6EO/K1NuQD4/Ph/XXfrTzHaAsmDsP1i6 lKS9yrxKuSk94DW2KnexwZEOGPfx6cE06gfds7AlCyG9BWh86VM26zFQguOKQR/0eUzTqqv1MYP TLmKlahto9Z/Bsm63r72bRxrUZoodp22ui46TyARtnreDIz/xE7N0JCC2XDqU4CbPoAPrCP9Hxh yWkBpI3Oqach/e3/1CyFvq81uJEQN0/DgEjlGVYqaLki X-Google-Smtp-Source: AGHT+IHCmaykGNUYnPQ6f9rvOJM9Xl2iP8dpj/Vi+n0rDrou5EDfrlU0CFM2RMBb2cq76Rnepl+fNg== X-Received: by 2002:a92:c567:0:b0:3ce:6628:3c4 with SMTP id e9e14a558f8ab-3cf74406301mr36031585ab.6.1737163405589; Fri, 17 Jan 2025 17:23:25 -0800 (PST) Received: from james-x399.localdomain (71-218-115-58.hlrn.qwest.net. [71.218.115.58]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3cf71b441e5sm8409405ab.57.2025.01.17.17.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2025 17:23:25 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Cc: James Hilliard Date: Fri, 17 Jan 2025 18:23:20 -0700 Message-Id: <20250118012320.2252811-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737163406; x=1737768206; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IiilQwdhWfC4tyxXRUrOsO0/GoDds0vpOMK5bDCQAZo=; b=dHpL2eCpXEYza6wLhOLDlazHBrZwrhVPOOikNizOcbZpqAz0yyw/X2QLjjDQ89F1ba pN+fbjBkw0qreTXaKgm7WF9+M0kN49r9P1swRSXYzvHZqGkJPun8M3QOuB3l7TcRrc2x mHNRuRZsTkDQaKVfm3QR35frD2f+MfHzvcQ7SABYGj11u3Yfvd2tWLRzipmj3Nj17GDT rXeQh87Pu6FEFM0P2owUS0Imrnzd+MpW0Zx0t19Kg8GaxPWEHDrNEaGbtVw/O8twluHg ExUJJ7yObREh1rWRpdOgmN9QEmSkqpwEcyWw1KOCZAxgNJNybYRpcpLuFH15jzFHdnFl ZVVQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=dHpL2eCp Subject: [Buildroot] [PATCH v2 1/1] package/fwupd: bump to version 2.0.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Drop no longer required libgudev dependency. Add new mandatory libusb dependency. Add new optional libdrm config option. Add new optional libblkid dependency and config option. Add new optional valgrind dependency and config option. Add new udev config option. Add new vendor_metadata config option. Add new umockdev_tests config option. Add new systemd_syscall_filter config option. Add new vendor_ids_dir config option. Remove gusb config option. Remove plugin_intel_spi config option. Remove compat_cli config option. Remove thinklmi_compat config option. Signed-off-by: James Hilliard --- Changes v1 -> v2: - also set vendor_ids_dir config option - make plugin_gpio conditional upon kernel headers >= 5.10 --- ...devdir-when-gudev-support-is-enabled.patch | 35 ------ package/fwupd/Config.in | 9 +- package/fwupd/fwupd.hash | 2 +- package/fwupd/fwupd.mk | 108 +++++++++--------- 4 files changed, 58 insertions(+), 96 deletions(-) delete mode 100644 package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch diff --git a/package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch b/package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch deleted file mode 100644 index 0f14508516..0000000000 --- a/package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a784ef9b904778b511a6284f46d983906939de6c Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 18 Jul 2024 09:44:15 -0600 -Subject: [PATCH] Only require udevdir when gudev support is enabled - -Signed-off-by: James Hilliard -Upstream: https://github.com/fwupd/fwupd/commit/a784ef9b904778b511a6284f46d983906939de6c ---- - meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 22282d73e..f49d08d29 100644 ---- a/meson.build -+++ b/meson.build -@@ -273,10 +273,12 @@ if build_daemon - if not polkit.found() - warning('Polkit is disabled, the daemon will allow ALL client actions') - endif -- udevdir = get_option('udevdir') -- if udevdir == '' and host_machine.system() == 'linux' -- udev = dependency('udev') -- udevdir = udev.get_variable(pkgconfig: 'udevdir') -+ if gudev.found() -+ udevdir = get_option('udevdir') -+ if udevdir == '' and host_machine.system() == 'linux' -+ udev = dependency('udev') -+ udevdir = udev.get_variable(pkgconfig: 'udevdir') -+ endif - endif - endif - libm = cc.find_library('m', required: false) --- -2.34.1 - diff --git a/package/fwupd/Config.in b/package/fwupd/Config.in index 6a96358e5b..778f59bbeb 100644 --- a/package/fwupd/Config.in +++ b/package/fwupd/Config.in @@ -2,11 +2,13 @@ config BR2_PACKAGE_FWUPD bool "fwupd" depends on !BR2_STATIC_LIBS # libxmlb depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # libglib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBJCAT select BR2_PACKAGE_LIBXMLB + select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_ZLIB help Fwupd is a simple daemon to allow session software @@ -14,6 +16,7 @@ config BR2_PACKAGE_FWUPD https://fwupd.org/ -comment "fwupd needs a toolchain w/ wchar, threads, dynamic library" +comment "fwupd needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/fwupd/fwupd.hash b/package/fwupd/fwupd.hash index 8da9dc3c66..f3a67508f2 100644 --- a/package/fwupd/fwupd.hash +++ b/package/fwupd/fwupd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b86a2d7fe1b6cc0ac4f75f3351a78cb3c225880c9e20b932fa078ef472e9fcb2 fwupd-1.9.20.tar.xz +sha256 73690175d0dd81849d729a0f247c69146ee9105c3c8c5d8428b64ad42d49b2f7 fwupd-2.0.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/fwupd/fwupd.mk b/package/fwupd/fwupd.mk index 9283eb43aa..5dc11dd953 100644 --- a/package/fwupd/fwupd.mk +++ b/package/fwupd/fwupd.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWUPD_VERSION = 1.9.20 +FWUPD_VERSION = 2.0.3 FWUPD_SITE = https://github.com/fwupd/fwupd/releases/download/$(FWUPD_VERSION) FWUPD_SOURCE = fwupd-$(FWUPD_VERSION).tar.xz FWUPD_LICENSE = LGPL-2.1+ @@ -14,6 +14,7 @@ FWUPD_DEPENDENCIES = \ host-python-jinja2 \ libglib2 \ libjcat \ + libusb \ libxmlb \ zlib @@ -24,34 +25,47 @@ FWUPD_CONF_OPTS = \ -Ddocs=disabled \ -Dlvfs=true \ -Dman=false \ - -Dgusb=disabled \ -Dpassim=disabled \ -Dp2p_policy=none \ -Dcbor=disabled \ -Dplugin_acpi_phat=enabled \ + -Dplugin_android_boot=enabled \ + -Dplugin_bcm57xx=enabled \ -Dplugin_cfu=disabled \ + -Dplugin_emmc=enabled \ -Dplugin_ep963x=enabled \ -Dplugin_fastboot=disabled \ + -Dplugin_igsc=enabled \ + -Dplugin_intel_me=enabled \ + -Dplugin_kinetic_dp=enabled \ -Dplugin_logitech_bulkcontroller=disabled \ -Dplugin_logitech_scribe=disabled \ -Dplugin_logitech_tap=disabled \ + -Dplugin_mediatek_scaler=enabled \ + -Dplugin_mtd=enabled \ + -Dplugin_nitrokey=enabled \ + -Dplugin_nvme=enabled \ + -Dplugin_parade_lspcon=enabled \ -Dplugin_pixart_rf=enabled \ + -Dplugin_powerd=enabled \ + -Dplugin_realtek_mst=enabled \ + -Dplugin_scsi=enabled \ + -Dplugin_synaptics_mst=enabled \ -Dplugin_tpm=disabled \ -Dplugin_uefi_capsule=enabled \ -Dplugin_uefi_capsule_splash=false \ - -Dplugin_nitrokey=enabled \ - -Dplugin_mtd=enabled \ - -Dplugin_intel_me=enabled \ + -Dplugin_uf2=enabled \ -Dplugin_upower=enabled \ - -Dplugin_powerd=enabled \ -Dqubes=false \ -Dsupported_build=enabled \ -Dlaunchd=disabled \ -Dtests=false \ + -Dumockdev_tests=disabled \ -Dmetainfo=true \ -Dfish_completion=false \ - -Dcompat_cli=false \ - -Dthinklmi_compat=false \ + -Dudev=enabled \ + -Dvendor_ids_dir=/usr/share/hwdata \ + -Dvendor_metadata=false \ -Dpython="$(HOST_DIR)/bin/python3" ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) @@ -68,41 +82,6 @@ else FWUPD_CONF_OPTS += -Dlibarchive=disabled endif -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -FWUPD_DEPENDENCIES += libgudev -FWUPD_CONF_OPTS += \ - -Dgudev=enabled \ - -Dplugin_android_boot=enabled \ - -Dplugin_bcm57xx=enabled \ - -Dplugin_emmc=enabled \ - -Dplugin_gpio=enabled \ - -Dplugin_igsc=enabled \ - -Dplugin_kinetic_dp=enabled \ - -Dplugin_parade_lspcon=enabled \ - -Dplugin_realtek_mst=enabled \ - -Dplugin_synaptics_mst=enabled \ - -Dplugin_mediatek_scaler=enabled \ - -Dplugin_scsi=enabled \ - -Dplugin_nvme=enabled \ - -Dplugin_uf2=enabled -else -FWUPD_CONF_OPTS += \ - -Dgudev=disabled \ - -Dplugin_android_boot=disabled \ - -Dplugin_bcm57xx=disabled \ - -Dplugin_emmc=disabled \ - -Dplugin_gpio=disabled \ - -Dplugin_igsc=disabled \ - -Dplugin_kinetic_dp=disabled \ - -Dplugin_parade_lspcon=disabled \ - -Dplugin_realtek_mst=disabled \ - -Dplugin_synaptics_mst=disabled \ - -Dplugin_mediatek_scaler=disabled \ - -Dplugin_scsi=disabled \ - -Dplugin_nvme=disabled \ - -Dplugin_uf2=disabled -endif - ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) FWUPD_DEPENDENCIES += bluez5_utils FWUPD_CONF_OPTS += -Dbluez=enabled @@ -134,20 +113,29 @@ endif ifeq ($(BR2_PACKAGE_XZ),y) FWUPD_DEPENDENCIES += xz FWUPD_CONF_OPTS += -Dlzma=enabled -ifeq ($(BR2_i386)$(BR2_x86_64),y) -FWUPD_CONF_OPTS += -Dplugin_intel_spi=true else -FWUPD_CONF_OPTS += -Dplugin_intel_spi=false +FWUPD_CONF_OPTS += -Dlzma=disabled endif + +ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU),y) +FWUPD_DEPENDENCIES += libdrm +FWUPD_CONF_OPTS += -Dlibdrm=enabled -Dplugin_amdgpu=enabled +else +FWUPD_CONF_OPTS += -Dlibdrm=disabled -Dplugin_amdgpu=disabled +endif + +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) +FWUPD_DEPENDENCIES += util-linux +FWUPD_CONF_OPTS += -Dblkid=enabled else -FWUPD_CONF_OPTS += -Dlzma=disabled -Dplugin_intel_spi=false +FWUPD_CONF_OPTS += -Dblkid=disabled endif -ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU)$(BR2_PACKAGE_LIBGUDEV),yy) -FWUPD_DEPENDENCIES += libdrm libgudev -FWUPD_CONF_OPTS += -Dplugin_amdgpu=enabled +ifeq ($(BR2_PACKAGE_VALGRIND),y) +FWUPD_DEPENDENCIES += valgrind +FWUPD_CONF_OPTS += -Dvalgrind=enabled else -FWUPD_CONF_OPTS += -Dplugin_amdgpu=disabled +FWUPD_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_i386)$(BR2_x86_64),y) @@ -156,8 +144,8 @@ else FWUPD_CONF_OPTS += -Dplugin_cpu=disabled -Dplugin_msr=disabled -Dhsi=disabled endif -ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGUDEV),yy) -FWUPD_DEPENDENCIES += gnutls libgudev +ifeq ($(BR2_PACKAGE_GNUTLS),y) +FWUPD_DEPENDENCIES += gnutls FWUPD_CONF_OPTS += -Dplugin_synaptics_rmi=enabled else FWUPD_CONF_OPTS += -Dplugin_synaptics_rmi=disabled @@ -170,8 +158,8 @@ else FWUPD_CONF_OPTS += -Dplugin_redfish=disabled -Dcurl=disabled endif -ifeq ($(BR2_PACKAGE_LIBGUDEV)$(BR2_PACKAGE_LIBMBIM)$(BR2_PACKAGE_LIBQMI)$(BR2_PACKAGE_MODEM_MANAGER),yyyy) -FWUPD_DEPENDENCIES += libgudev libmbim libqmi modem-manager +ifeq ($(BR2_PACKAGE_LIBMBIM)$(BR2_PACKAGE_LIBQMI)$(BR2_PACKAGE_MODEM_MANAGER),yyyy) +FWUPD_DEPENDENCIES += libmbim libqmi modem-manager FWUPD_CONF_OPTS += -Dplugin_modem_manager=enabled else FWUPD_CONF_OPTS += -Dplugin_modem_manager=disabled @@ -184,11 +172,17 @@ else FWUPD_CONF_OPTS += -Dplugin_flashrom=disabled endif +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10),y) +FWUPD_CONF_OPTS += -Dplugin_gpio=enabled +else +FWUPD_CONF_OPTS += -Dplugin_gpio=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) FWUPD_DEPENDENCIES += systemd -FWUPD_CONF_OPTS += -Dsystemd=enabled -Delogind=enabled -Doffline=enabled +FWUPD_CONF_OPTS += -Dsystemd=enabled -Dsystemd_syscall_filter=true -Delogind=enabled else -FWUPD_CONF_OPTS += -Dsystemd=disabled -Delogind=disabled -Doffline=disabled +FWUPD_CONF_OPTS += -Dsystemd=disabled -Dsystemd_syscall_filter=false -Delogind=disabled endif ifeq ($(BR2_PACKAGE_FWUPD_EFI),y) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot