[pull] master from openwrt:master

net/openvswitch/Makefile

@@ -17,7 +17,7 @@ include ./openvswitch.mk
 #
 PKG_NAME:=openvswitch
 PKG_VERSION:=$(ovs_version)
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
 PKG_HASH:=e1b3fa472676626853f22d63f959e5ad061e1bf57e1bbd444d0ed88f947ef8b1
@@ -54,6 +54,12 @@ ovs_kmod_package_name=$(if $(filter openvswitch,$(1)),openvswitch,$(1))
 ovs_kmod_is_intree=$(filter %-intree,$(1))
 ovs_kmod_upstream_name=kmod-$(call ovs_kmod_package_name,$(patsubst %-intree,%,$(1)))
 ovs_kmod_package_provides=$(call ovs_kmod_upstream_name,$(1))
+# Do not use PROVIDES for any OVS kmod. The provider-alternation logic in
+# scripts/package-metadata.pl generates recursive Kconfig dependencies when
+# kmod-openvswitch-intree provides kmod-openvswitch, because userspace
+# packages (openvswitch, ovsd, ovn-host) that +depend on kmod-openvswitch
+# get cross-referenced against the intree provider via PACKAGE_<provider>
+# < PACKAGE_<requester> conditions (#22664).
 define OvsKmodPackageTemplate
 ifeq ($(if $(call ovs_kmod_is_intree,$(1)),$(ovs_kmod_intree_not_supported)),)
   define KernelPackage/$(call ovs_kmod_package_name,$(1))
@@ -62,7 +68,6 @@ ifeq ($(if $(call ovs_kmod_is_intree,$(1)),$(ovs_kmod_intree_not_supported)),)
      SUBMENU:=Network Support
      TITLE:=$(ovs_kmod_$(1)_title)
      DEPENDS:=$(ovs_kmod_$(1)_depends) $(if $(call ovs_kmod_is_intree,$(1)),@IPV6 @DEVEL)
-     PROVIDES:=$(call ovs_kmod_package_provides,$(1))
      KCONFIG:=$(ovs_kmod_$(1)_kconfig)
      FILES:=$(ovs_kmod_$(1)_files)
      AUTOLOAD:=$(call AutoProbe,$(foreach m,$(ovs_kmod_$(1)_files),$(notdir $(patsubst %.ko,%,$(basename $(m))))))

utils/fwupd/Config.in

@@ -1,5 +1,4 @@
 menu "Select fwupd options"
-	depends on PACKAGE_fwupd-libs
 
 config FWUPD_FIRMWARE_PACKAGER
 	bool "firmware packager"

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.