Skip to contentSkip to conversation

package/fwupd: bump to version 2.0.3

PATCH Superseded James Hilliard 2 participants 2 messages Jan 19, 2025 – Jan 23, 2025

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/fwupd: bump to version 2.0.3

Drop no longer required libgudev dependency.

Add a patch fixing a uclibc build issue.

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.

---
Changes v2 -> v3:
- add patch fixing uclibc builds
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 ------
 .../0001-trivial-fix-build-with-uclibc.patch  |  74 ++++++++++++
 package/fwupd/Config.in                       |   9 +-
 package/fwupd/fwupd.hash                      |   2 +-
 package/fwupd/fwupd.mk                        | 108 +++++++++---------
 5 files changed, 132 insertions(+), 96 deletions(-)
 delete mode 100644 package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch
 create mode 100644 package/fwupd/0001-trivial-fix-build-with-uclibc.patch
package/fwupd/0001-Only-require-udevdir-when-gudev-support-is-enabled.patch deleted +0 -35
deleted file mode 100644
index 0f14508516..0000000000
@@ -1,35 +0,0 @@
-From a784ef9b904778b511a6284f46d983906939de6c Mon Sep 17 00:00:00 2001
-From: James Hilliard <[email protected]>
-Date: Thu, 18 Jul 2024 09:44:15 -0600
-Subject: [PATCH] Only require udevdir when gudev support is enabled
-
-Signed-off-by: James Hilliard <[email protected]>
-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
-
package/fwupd/0001-trivial-fix-build-with-uclibc.patch new file +74 -0

74 lines not on this page · raw message

package/fwupd/Config.in +6 -3
index 6a96358e5b..778f59bbeb 100644
@@ -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
package/fwupd/fwupd.hash +1 -1
index 8da9dc3c66..f3a67508f2 100644
@@ -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
package/fwupd/fwupd.mk +51 -57

186 lines not on this page · raw message

Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hi James,

Thanks for the update.

There is still build failures for Kernel headers < v4.5. See:
https://gitlab.com/jolivain/buildroot/-/pipelines/1638625539

On 20/01/2025 00:32, James Hilliard wrote:
[...]

Quoted 4 lines
package/fwupd/fwupd.mk +0 -0
index 9283eb43aa..5dc11dd953 100644

[...]

Quoted 1 line
package/fwupd/fwupd.mk +0 -0
@@ -24,34 +25,47 @@ FWUPD_CONF_OPTS = \

[...]

package/fwupd/fwupd.mk FWUPD_CONF_OPTS = \ · line 47

Quoted 1 line
package/fwupd/fwupd.mk +1 -0
+	-Dplugin_nvme=enabled \

You may have missed my last comment, in the v2 review:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/#3446941
I'm putting it here again:

The build failure seems to be related to "-Dplugin_nvme=enabled" which needs "linux/nvme_ioctl.h". This header is available in Kernel >= 4.5. For the details, you can have a look at:
https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

So this option might need the same logic as you did for -Dplugin_gpio.

Could you send an updated patch please?

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot