diff --git a/net/transmission-web-control/Makefile b/net/transmission-web-control/Makefile index 5ab7fe4d..98547616 100644 --- a/net/transmission-web-control/Makefile +++ b/net/transmission-web-control/Makefile @@ -19,7 +19,7 @@ define Package/transmission-web-control SECTION:=net CATEGORY:=Network SUBMENU:=BitTorrent - DEPENDS:=+transmission-daemon-openssl + DEPENDS:=+transmission-daemon CONFLICTS:=transmission-web TITLE:=Transmission Web Control URL:=https://github.com/ronggang/transmission-web-control diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 77fb4249..bca89385 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -39,7 +39,7 @@ define Package/transmission-daemon/Default USERID:=transmission=224:transmission=224 endef -define Package/transmission-daemon-openssl +define Package/transmission-daemon $(call Package/transmission-daemon/Default) TITLE+= (with OpenSSL) DEPENDS+=+libopenssl @@ -53,7 +53,7 @@ define Package/transmission-daemon-mbedtls VARIANT:=mbedtls endef -define Package/transmission-cli-openssl +define Package/transmission-cli $(call Package/transmission/template) TITLE+= (with OpenSSL) DEPENDS+=+libopenssl @@ -67,7 +67,7 @@ define Package/transmission-cli-mbedtls VARIANT:=mbedtls endef -define Package/transmission-remote-openssl +define Package/transmission-remote $(call Package/transmission/template) TITLE+= (with OpenSSL) DEPENDS+=+libopenssl @@ -84,7 +84,7 @@ endef define Package/transmission-web $(call Package/transmission/template) TITLE+= (webinterface) - DEPENDS:=+transmission-daemon-openssl + DEPENDS:=+transmission-daemon PKGARCH:=all endef @@ -95,29 +95,29 @@ define Package/transmission-daemon/Default/description on top on an efficient, cross-platform back-end. This package contains the daemon itself. endef -Package/transmission-daemon-openssl/description = $(Package/transmission-daemon/Default/description) +Package/transmission-daemon/description = $(Package/transmission-daemon/Default/description) Package/transmission-daemon-mbedtls/description = $(Package/transmission-daemon/Default/description) define Package/transmission-cli/Default/description CLI utilities for transmission. endef -Package/transmission-cli-openssl/description = $(Package/transmission-cli/Default/description) +Package/transmission-cli/description = $(Package/transmission-cli/Default/description) Package/transmission-cli-mbedtls/description = $(Package/transmission-cli/Default/description) define Package/transmission-remote/Default/description CLI remote interface for transmission. endef -Package/transmission-remote-openssl/description = $(Package/transmission-remote/Default/description) +Package/transmission-remote/description = $(Package/transmission-remote/Default/description) Package/transmission-remote-mbedtls/description = $(Package/transmission-remote/Default/description) define Package/transmission-web/description Webinterface resources for transmission. endef -define Package/transmission-daemon-openssl/conffiles +define Package/transmission-daemon/conffiles /etc/config/transmission endef -Package/transmission-daemon-mbedtls/conffiles = $(Package/transmission-daemon-openssl/conffiles) +Package/transmission-daemon-mbedtls/conffiles = $(Package/transmission-daemon/conffiles) TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -Wl,--as-needed @@ -141,7 +141,7 @@ else CONFIGURE_ARGS += --with-crypto=openssl endif -define Package/transmission-daemon-openssl/install +define Package/transmission-daemon/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d/ @@ -151,9 +151,9 @@ define Package/transmission-daemon-openssl/install $(INSTALL_DIR) $(1)/etc/sysctl.d/ $(INSTALL_CONF) files/transmission.sysctl $(1)/etc/sysctl.d/20-transmission.conf endef -Package/transmission-daemon-mbedtls/install = $(Package/transmission-daemon-openssl/install) +Package/transmission-daemon-mbedtls/install = $(Package/transmission-daemon/install) -define Package/transmission-cli-openssl/install +define Package/transmission-cli/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-cli \ $(PKG_INSTALL_DIR)/usr/bin/transmission-create \ @@ -161,23 +161,23 @@ define Package/transmission-cli-openssl/install $(PKG_INSTALL_DIR)/usr/bin/transmission-show \ $(1)/usr/bin/ endef -Package/transmission-cli-mbedtls/install = $(Package/transmission-cli-openssl/install) +Package/transmission-cli-mbedtls/install = $(Package/transmission-cli/install) -define Package/transmission-remote-openssl/install +define Package/transmission-remote/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-remote $(1)/usr/bin/ endef -Package/transmission-remote-mbedtls/install = $(Package/transmission-remote-openssl/install) +Package/transmission-remote-mbedtls/install = $(Package/transmission-remote/install) define Package/transmission-web/install $(INSTALL_DIR) $(1)/usr/share/transmission $(CP) $(PKG_INSTALL_DIR)/usr/share/transmission/web $(1)/usr/share/transmission/ endef -$(eval $(call BuildPackage,transmission-daemon-openssl)) +$(eval $(call BuildPackage,transmission-daemon)) #$(eval $(call BuildPackage,transmission-daemon-mbedtls)) -$(eval $(call BuildPackage,transmission-cli-openssl)) +$(eval $(call BuildPackage,transmission-cli)) #$(eval $(call BuildPackage,transmission-cli-mbedtls)) -$(eval $(call BuildPackage,transmission-remote-openssl)) +$(eval $(call BuildPackage,transmission-remote)) #$(eval $(call BuildPackage,transmission-remote-mbedtls)) $(eval $(call BuildPackage,transmission-web))