Skip to content

Commit

Permalink
Introduce and use FREETZ_HAS_AVM_MINID, getting rid of yet another wa…
Browse files Browse the repository at this point in the history
…rning (refs #1532):

{{{
(FREETZ_TYPE_SPEEDPORT_W701V_7170 && FREETZ_TYPE_3170_7170 && FREETZ_TYPE_7112_7170 && FREETZ_TYPE_7113_7170 && FREETZ_REMOVE_VOIP_ISDN)
    selects FREETZ_REMOVE_MINID which has unmet direct dependencies
    (FREETZ_TYPE_FON_WLAN_7141 !|| FREETZ_TYPE_FON_WLAN_7170 !|| FREETZ_TYPE_FON_WLAN_7240 !|| FREETZ_TYPE_FON_WLAN_7270_V2 !|| FREETZ_TYPE_FON_WLAN_7270_V3 !|| FREETZ_TYPE_WLAN_3270 !|| FREETZ_TYPE_WLAN_3270_V3)
}}}


git-svn-id: file:///var/svn/freetz/trunk@7858 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information
kriegaex committed Oct 19, 2011
1 parent e9fefca commit fc1cf6a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
23 changes: 19 additions & 4 deletions Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ choice
depends on FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LANG_DE
select FREETZ_REMOVE_FTPD
select FREETZ_REMOVE_MEDIASRV
select FREETZ_REMOVE_MINID
select FREETZ_REMOVE_PRINTSERV
select FREETZ_REMOVE_PRINTSERV_MODULE if ! FREETZ_MODULE_usblp
select FREETZ_REMOVE_SMBD
Expand All @@ -334,7 +333,6 @@ choice
config FREETZ_TYPE_3170_7170
bool "3170"
depends on FREETZ_TYPE_FON_WLAN_7170
select FREETZ_REMOVE_MINID
select FREETZ_REMOVE_VOIPD
select FREETZ_REMOVE_VOIP_ISDN
select FREETZ_REMOVE_CAPIOVERTCP
Expand All @@ -347,7 +345,6 @@ choice
depends on FREETZ_TYPE_FON_WLAN_7170
select FREETZ_REMOVE_FTPD
select FREETZ_REMOVE_MEDIASRV
select FREETZ_REMOVE_MINID
select FREETZ_REMOVE_PRINTSERV
select FREETZ_REMOVE_PRINTSERV_MODULE if ! FREETZ_MODULE_usblp
select FREETZ_REMOVE_SMBD
Expand All @@ -360,7 +357,6 @@ choice
depends on FREETZ_TYPE_FON_WLAN_7170
select FREETZ_REMOVE_FTPD
select FREETZ_REMOVE_MEDIASRV
select FREETZ_REMOVE_MINID
select FREETZ_REMOVE_PRINTSERV
select FREETZ_REMOVE_PRINTSERV_MODULE if ! FREETZ_MODULE_usblp
select FREETZ_REMOVE_SMBD
Expand Down Expand Up @@ -775,6 +771,25 @@ config FREETZ_HAS_AVM_AURA_USB
Select this if your original firmware has an aura-usb-daemon (remote USB
connection, USB-Fernanschluss)

config FREETZ_HAS_AVM_MINID
bool "Has mini-daemon (minid)" if FREETZ_TYPE_CUSTOM
select FREETZ_REMOVE_MINID if \
FREETZ_TYPE_7113_7170 || \
FREETZ_TYPE_7112_7170 || \
FREETZ_TYPE_3170_7170 || \
FREETZ_TYPE_SPEEDPORT_W701V_7170
default y if \
FREETZ_TYPE_FON_WLAN_7141 || \
FREETZ_TYPE_FON_WLAN_7170 || \
FREETZ_TYPE_FON_WLAN_7240 || \
FREETZ_TYPE_FON_WLAN_7270_V2 || \
FREETZ_TYPE_FON_WLAN_7270_V3 || \
FREETZ_TYPE_WLAN_3270 || \
FREETZ_TYPE_WLAN_3270_V3
default n
help
Select this if your original firmware has a mini-daemon (minid)

config FREETZ_HAS_AVM_NTFS
bool "Has AVM NTFS" if FREETZ_TYPE_CUSTOM
default y if \
Expand Down
11 changes: 2 additions & 9 deletions patches/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -791,14 +791,7 @@ config FREETZ_REMOVE_MEDIASRV
config FREETZ_REMOVE_MINID
bool "Remove minid and MT-D/F" if FREETZ_SHOW_ADVANCED
default n
depends on \
FREETZ_TYPE_FON_WLAN_7141 || \
FREETZ_TYPE_FON_WLAN_7170 || \
FREETZ_TYPE_FON_WLAN_7240 || \
FREETZ_TYPE_FON_WLAN_7270_V2 || \
FREETZ_TYPE_FON_WLAN_7270_V3 || \
FREETZ_TYPE_WLAN_3270 || \
FREETZ_TYPE_WLAN_3270_V3
depends on FREETZ_HAS_AVM_MINID
help
Remove the mini-daemon (minid) and some other related files. This patch
removes Fritz!Mini and MT-D/F support and all Web UI entrys.
Expand Down Expand Up @@ -1006,7 +999,7 @@ config FREETZ_REMOVE_VOIP_ISDN
select FREETZ_REMOVE_VOIPD
select FREETZ_REMOVE_DTRACE
select FREETZ_REMOVE_CAPIOVERTCP
select FREETZ_REMOVE_MINID
select FREETZ_REMOVE_MINID if FREETZ_HAS_AVM_MINID
default n
help
Radically remove a lot of telephony-related files. This patch saves about
Expand Down

0 comments on commit fc1cf6a

Please sign in to comment.