mirror of
https://github.com/openwrt/packages.git
synced 2026-10-22 08:34:22 +04:00
weechat: fix recursive Kconfig dependency
weechat-full conflicts with weechat-minimal, so weechat-full can only
be built in if weechat-minimal is not. luci-app-weechat depends on the
virtual weechat and selects the default variant weechat-minimal unless
weechat-full is selected. Together this is a recursive dependency:
PACKAGE_luci-app-weechat depends on PACKAGE_weechat-full
PACKAGE_weechat-full depends on PACKAGE_weechat-minimal
PACKAGE_weechat-minimal is selected by PACKAGE_luci-app-weechat
It also keeps weechat-full out of any image with luci-app-weechat,
because the selected weechat-minimal wins.
Move the conflict to the default variant weechat-minimal. The build
system does the same since openwrt.git commit 6d5c71f748 ("build:
auto-generate CONFLICTS for package variants sharing PROVIDES"), but
only if the other variant does not declare the conflict itself. Keep
it explicit for branches without that commit, like openwrt-25.12.
Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Suggested-by: Mario Andrés Pérez <mapb_@outlook.com>
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
1 parent
3d6229131a
commit
f7d67ef877
1 file changed
+2
-2
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=weechat
|
||||
PKG_VERSION:=4.10.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://weechat.org/files/src/
|
||||
@@ -63,6 +63,7 @@ define Package/weechat-minimal
|
||||
VARIANT:=minimal
|
||||
DEFAULT_VARIANT:=1
|
||||
PROVIDES:=weechat
|
||||
CONFLICTS:=weechat-full
|
||||
endef
|
||||
|
||||
define Package/weechat-minimal/description
|
||||
@@ -76,7 +77,6 @@ define Package/weechat-full
|
||||
DEPENDS+= +libncurses
|
||||
VARIANT:=full
|
||||
PROVIDES:=weechat
|
||||
CONFLICTS:=weechat-minimal
|
||||
endef
|
||||
|
||||
define Package/weechat-full/description
|
||||
|
||||
Reference in new issue
Block a user