transmission: Restored config_overwrite due to popular demand.

libnatpmp was added as a dependancy to avoid built-in version.

Makefile went through a few adjustments to make it simpler.

CMake support is not happening since Travis is using a broken Ubuntu install.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-02-13 11:59:20 -08:00
parent eac8d11f27
commit ae3e314674
3 changed files with 38 additions and 42 deletions

View file

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=transmission
PKG_VERSION:=2.93
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/transmission/transmission-releases/raw/master
PKG_SOURCE_URL:=@GITHUB/transmission/transmission-releases/master
PKG_HASH:=8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@ -32,12 +32,11 @@ define Package/transmission/template
CATEGORY:=Network
TITLE:=BitTorrent client
URL:=http://www.transmissionbt.com
MAINTAINER:=Rosen Penev <rosenp@gmail.com>
DEPENDS:=+ca-bundle +libcurl +libevent2 +libminiupnpc +libnatpmp +libpthread +librt +zlib
endef
define Package/transmission-daemon/Default
$(call Package/transmission/template)
DEPENDS:=+ca-bundle +libcurl +libevent2 +libminiupnpc +libpthread +librt +zlib
USERID:=transmission=224:transmission=224
endef
@ -55,39 +54,29 @@ define Package/transmission-daemon-mbedtls
VARIANT:=mbedtls
endef
define Package/transmission-cli/Default
$(call Package/transmission/template)
DEPENDS:=+ca-bundle +libcurl +libevent2 +libminiupnpc +libpthread +librt +zlib
endef
define Package/transmission-cli-openssl
$(call Package/transmission-cli/Default)
$(call Package/transmission/template)
TITLE+= (with OpenSSL)
DEPENDS+=+libopenssl
VARIANT:=openssl
endef
define Package/transmission-cli-mbedtls
$(call Package/transmission-cli/Default)
$(call Package/transmission/template)
TITLE+= (with mbed TLS)
DEPENDS+=+libmbedtls
VARIANT:=mbedtls
endef
define Package/transmission-remote/Default
$(call Package/transmission/template)
DEPENDS:=+ca-bundle +libcurl +libevent2 +libminiupnpc +libpthread +librt +zlib
endef
define Package/transmission-remote-openssl
$(call Package/transmission-remote/Default)
$(call Package/transmission/template)
TITLE+= (with OpenSSL)
DEPENDS+=+libopenssl
VARIANT:=openssl
endef
define Package/transmission-remote-mbedtls
$(call Package/transmission-remote/Default)
$(call Package/transmission/template)
TITLE+= (with mbed TLS)
DEPENDS+=+libmbedtls
VARIANT:=mbedtls

View file

@ -1,6 +1,7 @@
config transmission
option enabled 0
option config_dir '/tmp/transmission'
option config_overwrite '1'
option user 'transmission'
option mem_percentage 50
option nice 10

View file

@ -46,6 +46,7 @@ transmission() {
local USE
local user
local config_overwrite
local download_dir config_dir
local mem_percentage
local nice
@ -57,6 +58,7 @@ transmission() {
config_get user "$cfg" 'user'
config_get download_dir "$cfg" 'download_dir' '/var/etc/transmission'
config_get mem_percentage "$cfg" 'mem_percentage' '50'
config_get config_overwrite "$cfg" config_overwrite 1
config_get nice "$cfg" nice 0
local MEM=$(sed -ne 's!^MemTotal:[[:space:]]*\([0-9]*\) kB$!\1!p' /proc/meminfo)
@ -72,6 +74,8 @@ transmission() {
[ -z "$user" ] || chown -R "$user:$user" $config_dir
}
[ "$config_overwrite" == 0 ] || {
echo "{" > $config_file
append_params "$cfg" \
@ -100,6 +104,8 @@ transmission() {
echo "\"invalid-key\": false" >> $config_file
echo "}" >> $config_file
}
cmdline="transmission-daemon -g $config_dir -f"
procd_open_instance
procd_set_param command $cmdline