git.99rst.org / openwrt-packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side (parent: c19e949)
Revert "transmission-web: set conflicts with transmission-web-control"
authorRichard Yu <redacted>
Mon, 6 May 2019 16:12:22 +0000 (00:12 +0800)
committerRichard Yu <redacted>
Mon, 6 May 2019 16:14:28 +0000 (00:14 +0800)
This reverts commit 18c9a03770793e084eab5601d51b21ca4b374f75.

To fix "make menuconfig" shows "recursive dependency detected".

Signed-off-by: Richard Yu <redacted>
net/transmission/Makefile patch | blob | history

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index bd6e557cfd19c825e8e207160f870f783d4a73a7..bbe073e698ad20d8d49544ae8767e617007493f9 100644 (file)
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -86,7 +86,6 @@ define Package/transmission-web
   $(call Package/transmission/template)
   TITLE+= (webinterface)
   DEPENDS:=@(PACKAGE_transmission-daemon-openssl||PACKAGE_transmission-daemon-mbedtls)
-  CONFLICTS:=transmission-web-control
   PKGARCH:=all
 endef
 
git clone https://git.99rst.org/PROJECT