From 68429af7dd35608791503e62a118bbfd6ee5b913 Mon Sep 17 00:00:00 2001 From: Toastman Date: Mon, 10 Oct 2011 18:39:35 +0700 Subject: [PATCH] changes to makefile, more builds --- release/src/Makefile | 172 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 59 deletions(-) diff --git a/release/src/Makefile b/release/src/Makefile index 959bdbb00a..7d185b2bf7 100644 --- a/release/src/Makefile +++ b/release/src/Makefile @@ -1,5 +1,5 @@ # -# Toplevel Makefile for the BCM947xx Linux Router release +# Toplevel Makefile for the BCM947xx Linux Router release Toastman October 10 2011 # # Copyright 2005, Broadcom Corporation # All Rights Reserved. @@ -37,14 +37,13 @@ include ./target.mak # Normally you'd do something like "make V1=8516 V2=-sub-ver a b c d" # But if you don't give anything for "V1", it'll get a default from tomato_version. V1 ?= "--def" -VPN ?= "VPN" -NC ?="NOCAT" ifeq ($(CONFIG_LINUX26),y) ND = "K26" else ND = "ND" endif + ifeq ($(NVRAM_SIZE),) NVRAM_SIZE = 0 endif @@ -244,8 +243,7 @@ what: # USB ("USB"|"") # JFFSv1 | NO_JFFS # NO_CIFS, NO_SSH, NO_ZEBRA, NO_SAMBA, NO_HTTPS, NO_XXTP, NO_LIBOPT -# SAMBA3, OPENVPN, IPV6SUPP, EBTABLES, NTFS, MEDIASRV, BBEXTRAS, USBEXTRAS, BCM57, SLIM, NOCAT -# SNMP +# SAMBA3, OPENVPN, IPV6SUPP, EBTABLES, NTFS, MEDIASRV, BBEXTRAS, USBEXTRAS, BCM57, SLIM, NOCAT, SNMP define RouterOptions @( \ @@ -340,6 +338,10 @@ define RouterOptions sed -i "/TCONFIG_NOCAT/d" $(1); \ echo "TCONFIG_NOCAT=y" >>$(1); \ fi; \ + if [ "$(SNMP)" = "y" ]; then \ + sed -i "/TCONFIG_SNMP/d" $(1); \ + echo "TCONFIG_SNMP=y" >>$(1); \ + fi; \ if [ "$(OPENVPN)" = "y" ]; then \ sed -i "/TCONFIG_LZO/d" $(1); \ echo "TCONFIG_LZO=y" >>$(1); \ @@ -350,10 +352,6 @@ define RouterOptions echo "TCONFIG_FTP_SSL=y" >>$(1); \ fi; \ fi; \ - if [ "$(SNMP)" = "y" ]; then \ - sed -i "/TCONFIG_SNMP/d" $(1); \ - echo "TCONFIG_SNMP=y" >>$(1); \ - fi; \ ) endef @@ -609,11 +607,11 @@ a: ## Make the "normal but without SSH" build b: - @$(MAKE) bin NO_SSH=y B=B BUILD_DESC="No SSH" USB="USB" + @$(MAKE) bin NO_SSH=y B=B BUILD_DESC="NoSSH" USB="USB" ## Make the "normal but without CIFS" build c: - @$(MAKE) bin NO_CIFS=y B=C BUILD_DESC="No CIFS" USB="USB" + @$(MAKE) bin NO_CIFS=y B=C BUILD_DESC="NoCIFS" USB="USB" ## Make the "normal but without SAMBA" (Lite) build d: @@ -626,28 +624,57 @@ endif ## Make the "normal (with NTFS support) + VPN" build e: 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)" USB="USB" SNMP=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" USB="USB" SNMP=y else - @$(MAKE) bin OPENVPN=y NTFS=y B=E BUILD_DESC="$(VPN)" USB="USB" SNMP=y + @$(MAKE) bin OPENVPN=y NTFS=y B=E BUILD_DESC="VPN" USB="USB" SNMP=y +endif + +## Make the "Mini: no USB, no CIFS, no Zebra" build - targeted for Netgear routers +f: + @$(MAKE) bin JFFSv1=y NO_CIFS=y NO_ZEBRA=y SLIM=y B=F BUILD_DESC="Mini" USB="" + +fs: + @$(MAKE) bin NO_CIFS=y NO_JFFS=y NO_ZEBRA=y SLIM=y B=FS BUILD_DESC="Tiny" USB="" + +ifeq ($(CONFIG_LINUX26),y) +## Make the "No USB with IPv6, no Zebra" build - for 4MB routers +i: + @$(MAKE) bin JFFSv1=y NO_CIFS=y NO_ZEBRA=y IPV6SUPP=y B=I BUILD_DESC="MiniIPv6" USB="" +endif + +ifeq ($(CONFIG_LINUX26),y) +## Make the "No USB with IPv6, no Zebra, with VPN" build - for 4MB routers +j: + @$(MAKE) bin JFFSv1=y NO_CIFS=y NO_XXTP=y SLIM=y NO_SAMBA=y NO_ZEBRA=y IPV6SUPP=y OPENVPN=y NO_LIBOPT=y B=I BUILD_DESC="MiniIPv6+VPN" USB="" endif ## Make the "normal with Extras and NTFS" build m: 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" USB="USB" SNMP=y + @$(MAKE) bin NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y SNMP=y IPV6SUPP=y B=M BUILD_DESC="Ext" USB="USB" else - @$(MAKE) bin NTFS=y BBEXTRAS=y USBEXTRAS=y B=M BUILD_DESC="Ext" USB="USB" SNMP=y + @$(MAKE) bin NTFS=y BBEXTRAS=y USBEXTRAS=y SNMP=y B=M BUILD_DESC="Ext" USB="USB" endif ## Roadkill ## Make the "normal (with NTFS support) + VPN + NOCAT" build nc: ifeq ($(CONFIG_LINUX26),y) - @$(MAKE) bin OPENVPN=y NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y IPV6SUPP=y B=NC BUILD_DESC="$(VPN)" USB="USB" SNMP=y NOCAT=y BUILD_DESC+="-$(NC)" + @$(MAKE) bin OPENVPN=y NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y IPV6SUPP=y B=NC BUILD_DESC="VPN+NOCAT" USB="USB" SNMP=y NOCAT=y else - @$(MAKE) bin OPENVPN=y NTFS=y B=NC BUILD_DESC="$(VPN)" USB="USB" NOCAT=y BUILD_DESC+=" $(NC)" + @$(MAKE) bin OPENVPN=y NTFS=y B=NC BUILD_DESC="VPN+NOCAT" USB="USB" NOCAT=y endif +## Toastman +## Make the "Mini: no USB, + NOCAT" build - for 4MB routers +ncm: + @$(MAKE) bin JFFSv1=y NOCAT=y B=F BUILD_DESC="Mini+NOCAT" USB="" + +## Toastman +## Make the "normal" build + NOCAT +ncs: + @$(MAKE) bin NOCAT=y B=A BUILD_DESC="Std+NOCAT" USB="USB" + ## Make the "No USB" build s: ifeq ($(CONFIG_LINUX26),y) @@ -656,66 +683,86 @@ else @$(MAKE) bin BBEXTRAS=y BCM57=y B=S BUILD_DESC="Std" USB="" SNMP=y endif -## Make the "Mini: no USB, no CIFS, no Zebra" build - targeted for Netgear routers -f: - @$(MAKE) bin JFFSv1=y NO_CIFS=y NO_ZEBRA=y SLIM=y B=F BUILD_DESC="Mini" USB="" - +## Make the "VPN witn no USB support" build +v: ifeq ($(CONFIG_LINUX26),y) -## Make the "No USB with IPv6, no Zebra" build - for 4MB routers -i: - @$(MAKE) bin JFFSv1=y NO_CIFS=y NO_ZEBRA=y IPV6SUPP=y B=I BUILD_DESC="MiniIPv6" USB="" + @$(MAKE) bin OPENVPN=y NO_JFFS=y B=V BUILD_DESC="NoUSB+VPN" USB="" SNMP=y +else + @$(MAKE) bin OPENVPN=y BBEXTRAS=y BCM57=y B=V BUILD_DESC="NoUSB+VPN" USB="" SNMP=y endif -## Make the "VPN witn no USB support" build -v: +## Make the "Small VPN with no USB support" build +vs: ifeq ($(CONFIG_LINUX26),y) - @$(MAKE) bin OPENVPN=y NO_JFFS=y B=V BUILD_DESC="$(VPN)" USB="" + @$(MAKE) bin OPENVPN=y NO_JFFS=y NO_CIFS=y B=V BUILD_DESC="SmallVPN" USB="" else - @$(MAKE) bin OPENVPN=y BBEXTRAS=y BCM57=y B=V BUILD_DESC="$(VPN)" USB="" + @$(MAKE) bin OPENVPN=y NO_JFFS=y NO_CIFS=y BCM57=y B=VS BUILD_DESC="SmallVPN" USB="" endif +## Make Mips32r2 builds +r2a: + @$(MAKE) a MIPS32=r2 -## Make Mips32r2 builds +r2b: + @$(MAKE) b MIPS32=r2 -r2m: - @$(MAKE) m MIPS32=r2 +r2c: + @$(MAKE) c MIPS32=r2 + +r2d: + @$(MAKE) d MIPS32=r2 r2e: @$(MAKE) e MIPS32=r2 -r2s: - @$(MAKE) s MIPS32=r2 - -r2v: - @$(MAKE) v MIPS32=r2 +r2f: + @$(MAKE) f MIPS32=r2 BELKIN=y r2i: @$(MAKE) i MIPS32=r2 -r2f: - @$(MAKE) f MIPS32=r2 BELKIN=y +r2j: + @$(MAKE) j MIPS32=r2 -r2d: - @$(MAKE) d MIPS32=r2 +r2m: + @$(MAKE) m MIPS32=r2 r2nc: @$(MAKE) nc MIPS32=r2 -n60nc: - @$(MAKE) r2nc NVRAM_SIZE=60 LINKSYS_E=1 +r2r: + @$(MAKE) r MIPS32=r2 -n60m: - @$(MAKE) r2m NVRAM_SIZE=60 LINKSYS_E=y +r2s: + @$(MAKE) s MIPS32=r2 + +r2t: + @$(MAKE) t MIPS32=r2 + +r2v: + @$(MAKE) v MIPS32=r2 n60e: @$(MAKE) r2e NVRAM_SIZE=60 LINKSYS_E=y +n60m: + @$(MAKE) r2m NVRAM_SIZE=60 LINKSYS_E=y + +n60n: + @$(MAKE) r2n NVRAM_SIZE=60 LINKSYS_E=1 + +n60nc: + @$(MAKE) r2nc NVRAM_SIZE=60 LINKSYS_E=y + +n60ncs: + @$(MAKE) r2o NVRAM_SIZE=60 LINKSYS_E=1 + n60s: @$(MAKE) bin MIPS32=r2 B=S USB="" NVRAM_SIZE=60 LINKSYS_E=y BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y BUILD_DESC="Std" n60v: - @$(MAKE) bin MIPS32=r2 B=V USB="" NVRAM_SIZE=60 LINKSYS_E=y BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y OPENVPN=y BUILD_DESC="$(VPN)" + @$(MAKE) bin MIPS32=r2 B=V USB="" NVRAM_SIZE=60 LINKSYS_E=y BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y OPENVPN=y BUILD_DESC="VPN" setprofile: echo '#ifndef TOMATO_PROFILE' > router/shared/tomato_profile.h @@ -773,29 +820,38 @@ help: @echo "b B build (standard minus SSH)" @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 "m M build (standard plus extra utilities SNMP and NTFS support)" + @echo "nc NC build (standard plus VPN, extra utilities, NTFS support and NOCAT)" + @echo "ncm NCS build (no USB support, NOCAT)" + @echo "ncs NCS build (std + NOCAT)" + ifeq ($(CONFIG_LINUX26),y) @echo "e E build (standard plus VPN, extra utilities and NTFS support)" @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 "e E build (standard plus VPN and NTFS support + SNMP)" endif - @echo "nc NC build (standard plus VPN, NOCAT, extra utilities and NTFS support)" - @echo "s S build (no USB support)" @echo "f F build (no USB support minus CIFS and RIPv1/2)" + @echo "fs FS build (no USB support minus JFFS, CIFS and RIPv1/2)" + @echo "s S build (no USB support) + SNMP" @echo "v V build (VPN with no USB support)" + @echo "vs VS build (small VPN with no USB support)" + ifeq ($(CONFIG_LINUX26),y) + @echo "r2a MIPS Release 2 A build (standard)" + @echo "r2e MIPS Release 2 E build (standard plus VPN SNMP NTFS and extras)" + @echo "r2f MIPS Release 2 F build (no USB support minus CIFS and RIPv1/2)" + @echo "r2i MIPS Release 2 I build (IPv6 with no USB support minus CIFS and RIPv1/2)" @echo "r2m MIPS Release 2 M build (standard plus extras)" - @echo "r2e MIPS Release 2 E build (standard plus VPN and extras)" - @echo "r2v MIPS Release 2 V build (VPN with no USB support)" + @echo "r2nc MIPS Release 2 NC build (standard plus VPN, extras and NOCAT)" @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)" - @echo "r2f MIPS Release 2 F build (no USB support minus CIFS and RIPv1/2)" - @echo "r2nc MIPS Release 2 NC build (standard plus VPN + NOCAT and extras)" - @echo "n60m Linksys E-series build (60KB NVRAM, standard plus extras)" + @echo "r2v MIPS Release 2 V build (VPN with no USB support)" + + @echo "n60m Linksys E-series build (60KB NVRAM, standard plus SNMP + extras)" @echo "n60e Linksys E-series build (60KB NVRAM, standard plus VPN and extras)" - @echo "n60nc Linksys E-series build (60KB NVRAM, standard plus VPN + NOCAT and extras)" - @echo "n60s Linksys E-series build (60KB NVRAM, no USB support)" + @echo "n60nc Linksys E-series build (60KB NVRAM, standard plus extras, plus SNMP, plus VPN, plus NOCAT)" + @echo "r2ncs Linksys E-series build (60KB NVRAM, standard plus NOCAT)" + @echo "n60s Linksys E-series build (60KB NVRAM, SNMP, no USB support)" @echo "n60v Linksys E-series build (60KB NVRAM, VPN with no USB support)" endif @echo "..etc.. other build configs" @@ -809,5 +865,3 @@ endif .PHONY: all clean distclean cleanimage cleantools cleankernel prepk what setprofile help .PHONY: a b c d m Makefile allversions tomato_profile.mak - - -- 2.11.4.GIT