From 884b71edf309a1c07b92c99cca2956ecf6543b09 Mon Sep 17 00:00:00 2001
From: Joshua Klinesmith <joshuaklinesmith@gmail.com>
Date: Wed, 1 Apr 2026 12:16:56 -0400
Subject: [PATCH] fwupd: fix recursive dependency in Config.in

The fwupd Config.in menu depends on PACKAGE_fwupd-libs, making
FWUPD_PLUGIN_FLASHROM implicitly depend on PACKAGE_fwupd-libs.
But fwupd-libs has a conditional dependency on libflashrom gated
by FWUPD_PLUGIN_FLASHROM, creating a circular dependency.

Fix by removing the depends on PACKAGE_fwupd-libs guard from the
Config.in menu and moving DEPENDS from Package/fwupd/Default into
Package/fwupd-libs directly. The menu options are always visible
in menuconfig but only take effect when fwupd-libs is selected.

Co-developed-by: Florian Eckert <fe@dev.tdt.de>
Signed-off-by: Joshua Klinesmith <joshuaklinesmith@gmail.com>

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 utils/fwupd/Config.in |  1 -
 utils/fwupd/Makefile  | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/utils/fwupd/Config.in b/utils/fwupd/Config.in
index 12da3c4791..f75db98459 100644
--- a/utils/fwupd/Config.in
+++ b/utils/fwupd/Config.in
@@ -1,5 +1,4 @@
 menu "Select fwupd options"
-	depends on PACKAGE_fwupd-libs
 
 config FWUPD_FIRMWARE_PACKAGER
 	bool "firmware packager"
diff --git a/utils/fwupd/Makefile b/utils/fwupd/Makefile
index 51bce671bd..50f82b89f9 100644
--- a/utils/fwupd/Makefile
+++ b/utils/fwupd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fwupd
 PKG_VERSION:=2.1.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/fwupd/fwupd/releases/download/$(PKG_VERSION)
@@ -36,6 +36,16 @@ define Package/fwupd/Default
   CATEGORY:=Utilities
   TITLE:=fwupd
   URL:=https://fwupd.org
+endef
+
+define Package/fwupd/Default/description
+  A simple system daemon to allow session software to easily update firmware on
+  your local machine.
+endef
+
+define Package/fwupd-libs
+  $(call Package/fwupd/Default)
+  TITLE:=fwupd-libs
   DEPENDS:= \
 	+glib2 \
 	+dbus \
@@ -54,16 +64,6 @@ define Package/fwupd/Default
 	+FWUPD_PLUGIN_MODEMMANAGER:libmbim
 endef
 
-define Package/fwupd/Default/description
-  A simple system daemon to allow session software to easily update firmware on
-  your local machine.
-endef
-
-define Package/fwupd-libs
-  $(call Package/fwupd/Default)
-  TITLE:=fwupd-libs
-endef
-
 define Package/fwupd-libs/description
   $(call Package/fwupd/Default/description)
   This package contains the fwupd libraries.