From 3cdc74aebf58d09449b7cd5abd082ea2ae07ea2c Mon Sep 17 00:00:00 2001
From: Shibby <shibby@openlinksys.info>
Date: Fri, 25 Feb 2011 23:17:08 +0100
Subject: [PATCH] allow to make images with Transmission - two new built type:
 F and N

---
 release/src/Makefile         | 31 +++++++++++++++++++++++++++++++
 release/src/btools/libfoo.pl | 10 +++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/release/src/Makefile b/release/src/Makefile
index a406823a67..a5c46e7941 100644
--- a/release/src/Makefile
+++ b/release/src/Makefile
@@ -295,6 +295,10 @@ define RouterOptions
 			echo "TCONFIG_FTP_SSL=y" >>$(1); \
 		fi; \
 	fi; \
+	if [ "$(BTCLIENT)" = "y" ]; then \
+		sed -i "/TCONFIG_BT/d" $(1); \
+		echo "TCONFIG_BT=y" >>$(1); \
+	fi; \
 	)
 endef
 
@@ -558,6 +562,14 @@ else
 	@$(MAKE) bin OPENVPN=y NTFS=y B=E BUILD_DESC="$(VPN)" USB="USB"
 endif
 
+## Make the "normal (with NTFS support) + VPN + BT Client" build
+f:
+ifeq ($(CONFIG_LINUX26),y)
+	@$(MAKE) bin OPENVPN=y NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y IPV6SUPP=y B=E BUILD_DESC="$(VPN)-BT" USB="USB" BTCLIENT=y
+else
+	@$(MAKE) bin OPENVPN=y NTFS=y B=E BUILD_DESC="$(VPN)-BT" USB="USB" BTCLIENT=y
+endif
+
 ## Make the "normal with Extras and NTFS" build
 m:
 ifeq ($(CONFIG_LINUX26),y)
@@ -566,6 +578,14 @@ else
 	@$(MAKE) bin NTFS=y BBEXTRAS=y USBEXTRAS=y B=M BUILD_DESC="Ext" USB="USB"
 endif
 
+## Make the "normal with Extras and NTFS and BT Client" build
+n:
+ifeq ($(CONFIG_LINUX26),y)
+	@$(MAKE) bin NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y IPV6SUPP=y B=M BUILD_DESC="Ext-BT" USB="USB" BTCLIENT=y
+else
+	@$(MAKE) bin NTFS=y BBEXTRAS=y USBEXTRAS=y B=M BUILD_DESC="Ext-BT" USB="USB" BTCLIENT=y
+endif
+
 ## Make the "No USB" build
 s:
 ifeq ($(CONFIG_LINUX26),y)
@@ -606,9 +626,15 @@ ifeq ($(CONFIG_LINUX26),y)
 r2m:
 	@$(MAKE) m MIPS32=r2
 
+r2n:
+	@$(MAKE) n MIPS32=r2
+
 r2e:
 	@$(MAKE) e MIPS32=r2
 
+r2f:
+	@$(MAKE) f MIPS32=r2
+
 r2s:
 	@$(MAKE) s MIPS32=r2
 
@@ -693,11 +719,14 @@ help:
 	@echo "c            C build (standard minus CIFS)"
 	@echo "d            D build (standard minus Samba server)"
 	@echo "m            M build (standard plus extra utilities and NTFS support)"
+	@echo "n            N build (standard plus extra utilities and NTFS support and BT Client)"
 ifeq ($(CONFIG_LINUX26),y)
 	@echo "e            E build (standard plus VPN, extra utilities and NTFS support)"
+	@echo "f            F build (standard plus VPN, extra utilities and NTFS support and BT Client)"
 	@echo "i            I build (IPv6 with no USB support minus CIFS and RIPv1/2)"
 else
 	@echo "e            E build (standard plus VPN and NTFS support)"
+	@echo "f            F build (standard plus VPN and NTFS support and BT Client)"
 endif
 	@echo "s            S build (no USB support)"
 	@echo "f            F build (no USB support minus CIFS and RIPv1/2)"
@@ -708,7 +737,9 @@ ifeq ($(CONFIG_LINUX26),y)
 endif
 ifeq ($(CONFIG_LINUX26),y)
 	@echo "r2m          MIPS Release 2 M build (standard plus extras)"
+	@echo "r2n          MIPS Release 2 N build (standard plus extras plus BT Client)"
 	@echo "r2e          MIPS Release 2 E build (standard plus VPN and extras)"
+	@echo "r2f          MIPS Release 2 F build (standard plus VPN and extras and BT Client)"
 	@echo "r2v          MIPS Release 2 V build (VPN with no USB support)"
 	@echo "r2s          MIPS Release 2 S build (no USB support)"
 	@echo "r2i          MIPS Release 2 I build (IPv6 with no USB support minus CIFS and RIPv1/2)"
diff --git a/release/src/btools/libfoo.pl b/release/src/btools/libfoo.pl
index 0d5a1c06d4..1478bda92e 100755
--- a/release/src/btools/libfoo.pl
+++ b/release/src/btools/libfoo.pl
@@ -155,7 +155,11 @@ sub fixDyn
 	fixDynDep("pppd", "rp-pppoe.so");
 
 	fixDynDep("libcrypto.so.1.0.0", "libssl.so.1.0.0");
-	
+
+#shibby
+	fixDynDep("transmission-daemon", "libevent-1.4.so.2.2.0");
+	fixDynDep("transmission-daemon", "libcurl.so.4.2.0");
+
 #	fixDynDep("libbcm.so", "libshared.so");
 #	fixDynDep("libbcm.so", "libc.so.0");
 
@@ -463,6 +467,10 @@ genSO("${root}/usr/lib/liblzo2.so.2", "${router}/lzo/src/.libs/liblzo2.a");
 
 genSO("${root}/usr/lib/libbcmcrypto.so", "${router}/libbcmcrypto/libbcmcrypto.a");
 
+#shibby
+genSO("${root}/usr/lib/libcurl.so.4.2.0", "${router}/libcurl/lib/.libs/libcurl.a", "", "-L${router}/zlib");
+genSO("${root}/usr/lib/libevent-1.4.so.2.2.0", "${router}/libevent/.libs/libevent.a");
+
 print "\n";
 
 close(LOG);
-- 
2.11.4.GIT