mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 10:51:55 +00:00
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>
This commit is contained in:
committed by
Florian Eckert
parent
39c9a7bff9
commit
884b71edf3
@@ -1,5 +1,4 @@
|
|||||||
menu "Select fwupd options"
|
menu "Select fwupd options"
|
||||||
depends on PACKAGE_fwupd-libs
|
|
||||||
|
|
||||||
config FWUPD_FIRMWARE_PACKAGER
|
config FWUPD_FIRMWARE_PACKAGER
|
||||||
bool "firmware packager"
|
bool "firmware packager"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=fwupd
|
PKG_NAME:=fwupd
|
||||||
PKG_VERSION:=2.1.1
|
PKG_VERSION:=2.1.1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/fwupd/fwupd/releases/download/$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/fwupd/fwupd/releases/download/$(PKG_VERSION)
|
||||||
@@ -36,6 +36,16 @@ define Package/fwupd/Default
|
|||||||
CATEGORY:=Utilities
|
CATEGORY:=Utilities
|
||||||
TITLE:=fwupd
|
TITLE:=fwupd
|
||||||
URL:=https://fwupd.org
|
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:= \
|
DEPENDS:= \
|
||||||
+glib2 \
|
+glib2 \
|
||||||
+dbus \
|
+dbus \
|
||||||
@@ -54,16 +64,6 @@ define Package/fwupd/Default
|
|||||||
+FWUPD_PLUGIN_MODEMMANAGER:libmbim
|
+FWUPD_PLUGIN_MODEMMANAGER:libmbim
|
||||||
endef
|
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
|
define Package/fwupd-libs/description
|
||||||
$(call Package/fwupd/Default/description)
|
$(call Package/fwupd/Default/description)
|
||||||
This package contains the fwupd libraries.
|
This package contains the fwupd libraries.
|
||||||
|
|||||||
Reference in New Issue
Block a user