Changeset 2700


Ignorieren:
Zeitstempel:
07.11.2008 23:08:08 (vor 9 Jahren)
Autor:
oliver
Nachricht:
  • Brandings:
    • move menu to patches
    • rename to "remove brandings" and reverse selection
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/Config.in

    r2697 r2700  
    4040        select FREETZ_AVM_VERSION_04_49 
    4141        bool "300IP as Fon" 
    42         select FREETZ_BRANDING_tcom 
    43         select FREETZ_BRANDING_avm 
    4442 
    4543    config FREETZ_TYPE_2170 
     
    125123    config FREETZ_TYPE_SPEEDPORT_W501V 
    126124        select FREETZ_AVM_VERSION_r7203 
    127         select FREETZ_BRANDING_tcom 
    128125        bool "Speedport W501V" 
    129126 
    130127    config FREETZ_TYPE_SPEEDPORT_W701V 
    131128        select FREETZ_AVM_VERSION_r8508 
    132         select FREETZ_BRANDING_tcom 
    133129        bool "Speedport W701V" 
    134130 
    135131#   config FREETZ_TYPE_SPEEDPORT_W900V 
    136132#       select FREETZ_AVM_VERSION_r4884 
    137 #       select FREETZ_BRANDING_tcom 
    138133#       bool "Speedport W900V" 
    139134 
     
    236231    #   bool "Sinus W500V" 
    237232    #   depends on FREETZ_TYPE_FON_7150 
    238     #   select FREETZ_BRANDING_tcom 
    239233    #   select FREETZ_MODULE_jffs2 
    240234    #   help 
     
    245239        bool "W701V" 
    246240        depends on FREETZ_TYPE_FON_WLAN_7170 
    247         select FREETZ_BRANDING_tcom 
    248241        help 
    249242            Enable this to compile a mod image for T-Com Speedport W701V based 
     
    253246        bool "W900V" 
    254247        depends on FREETZ_TYPE_FON_WLAN_7170 
    255         select FREETZ_BRANDING_tcom 
    256248        help 
    257249            Enable this to compile a mod image for T-Com Speedport W900V based 
     
    688680        Select this if your USB port is a host adapter 
    689681 
    690 menu "Branding" 
     682 
     683comment "Mod ------------------------------------" 
     684 
     685choice 
     686 
     687    prompt "Language" 
     688    default FREETZ_LANG_DE      if FREETZ_TYPE_LANG_DE 
     689    default FREETZ_LANG_DE      if FREETZ_TYPE_LANG_A_CH 
     690    default FREETZ_LANG_EN      if FREETZ_TYPE_LANG_EN 
     691 
     692    config FREETZ_LANG_DE 
     693        bool "de - deutsch" 
     694 
     695    config FREETZ_LANG_EN 
     696        bool "en - english" 
     697 
     698endchoice 
     699 
     700config FREETZ_LANG_STRING 
     701    string 
     702    default "de"            if FREETZ_LANG_DE 
     703    default "en"            if FREETZ_LANG_EN 
     704 
     705menu "Patches" 
     706 
     707comment "No Brandings available to remove" 
     708    depends on \ 
     709        FREETZ_TYPE_SPEEDPORT_W501V || \ 
     710        FREETZ_TYPE_SPEEDPORT_W701V || \ 
     711        FREETZ_TYPE_SPEEDPORT_W900V 
     712 
     713menu "Remove Brandings" 
    691714    depends on \ 
    692715        ! FREETZ_TYPE_SPEEDPORT_W501V && \ 
     
    694717        ! FREETZ_TYPE_SPEEDPORT_W900V 
    695718 
    696 #comment "Brandings ------------------------------" 
    697 #   depends on \ 
    698 #       ( \ 
    699 #       ! FREETZ_TYPE_SPEEDPORT_W501V && \ 
    700 #       ! FREETZ_TYPE_SPEEDPORT_W701V && \ 
    701 #       ! FREETZ_TYPE_SPEEDPORT_W900V && \ 
    702 #       ! FREETZ_TYPE_CUSTOM \ 
    703 #       ) 
    704  
    705 #comment "Brandings (if exist) -------------------" 
    706 #   depends on FREETZ_TYPE_CUSTOM && FREETZ_SHOW_ADVANCED 
     719comment "avm and tcom branding can't be removed" 
     720    depends on \ 
     721        FREETZ_TYPE_ALIEN_HARDWARE 
    707722 
    708723config FREETZ_BRANDING_1und1 
     
    725740        FREETZ_TYPE_WLAN_3130 || \ 
    726741        FREETZ_TYPE_CUSTOM \ 
    727         ) \ 
    728         && ! FREETZ_TYPE_ALIEN_HARDWARE 
    729     default y 
     742        ) 
     743    default n 
    730744    help 
    731745        1&1 branding 
     
    733747        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    734748 
    735         NOTE: Make sure to choose at least one branding corresponding to the one 
    736         defined in your box's boot loader environment. It can be determined by calling 
    737         the following command from the box's shell prompt: 
     749        NOTE: Make sure not to remove the branding corresponding to the one defined  
     750        in your box's boot loader environment. It can be determined by calling the 
     751        following command from the box's shell prompt: 
    738752 
    739753        echo $(cat /proc/sys/urlader/firmware_version) 
     
    743757    depends on \ 
    744758        ( \ 
    745         ! FREETZ_BRANDING_tcom && \ 
    746759        FREETZ_TYPE_LANG_A_CH || \ 
    747760        FREETZ_TYPE_LANG_DE || \ 
    748761        FREETZ_TYPE_CUSTOM \ 
    749         ) 
    750     default y 
     762        ) \ 
     763        && ! FREETZ_TYPE_ALIEN_HARDWARE 
     764    default n 
    751765    help 
    752766        AVM branding 
     
    754768        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    755769 
    756         NOTE: Make sure to choose at least one branding corresponding to the one 
    757         defined in your box's boot loader environment. It can be determined by calling 
    758         the following command from the box's shell prompt: 
     770        NOTE: Make sure not to remove the branding corresponding to the one defined  
     771        in your box's boot loader environment. It can be determined by calling the 
     772        following command from the box's shell prompt: 
    759773 
    760774        echo $(cat /proc/sys/urlader/firmware_version) 
     
    767781        FREETZ_TYPE_CUSTOM \ 
    768782        ) 
    769     default y 
     783    default n 
    770784    help 
    771785        AVM international branding 
     
    773787        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    774788 
    775         NOTE: Make sure to choose at least one branding corresponding to the one 
    776         defined in your box's boot loader environment. It can be determined by calling 
    777         the following command from the box's shell prompt: 
     789        NOTE: Make sure not to remove the branding corresponding to the one defined  
     790        in your box's boot loader environment. It can be determined by calling the 
     791        following command from the box's shell prompt: 
    778792 
    779793        echo $(cat /proc/sys/urlader/firmware_version) 
     
    789803        FREETZ_TYPE_CUSTOM \ 
    790804        ) 
    791     default y 
     805    default n 
    792806    help 
    793807        AOL branding 
     
    795809        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    796810 
    797         NOTE: Make sure to choose at least one branding corresponding to the one 
    798         defined in your box's boot loader environment. It can be determined by calling 
    799         the following command from the box's shell prompt: 
     811        NOTE: Make sure not to remove the branding corresponding to the one defined  
     812        in your box's boot loader environment. It can be determined by calling the 
     813        following command from the box's shell prompt: 
    800814 
    801815        echo $(cat /proc/sys/urlader/firmware_version) 
     
    804818    bool "Arcor" 
    805819    depends on FREETZ_TYPE_CUSTOM 
    806     default y 
     820    default n 
    807821    help 
    808822        Arcor branding 
     
    810824        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    811825 
    812         NOTE: Make sure to choose at least one branding corresponding to the one 
    813         defined in your box's boot loader environment. It can be determined by calling 
    814         the following command from the box's shell prompt: 
     826        NOTE: Make sure not to remove the branding corresponding to the one defined  
     827        in your box's boot loader environment. It can be determined by calling the 
     828        following command from the box's shell prompt: 
    815829 
    816830        echo $(cat /proc/sys/urlader/firmware_version) 
     
    820834    depends on \ 
    821835        FREETZ_TYPE_SPEEDPORT_W701V  
    822     default y 
     836    default n 
    823837    help 
    824838        Congstar branding 
     
    826840        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    827841 
    828         NOTE: Make sure to choose at least one branding corresponding to the one 
    829         defined in your box's boot loader environment. It can be determined by calling 
    830         the following command from the box's shell prompt: 
     842        NOTE: Make sure not to remove the branding corresponding to the one defined  
     843        in your box's boot loader environment. It can be determined by calling the 
     844        following command from the box's shell prompt: 
    831845 
    832846        echo $(cat /proc/sys/urlader/firmware_version) 
     
    844858        FREETZ_TYPE_FON_WLAN_7170 || \ 
    845859        FREETZ_TYPE_CUSTOM \ 
    846         ) \ 
    847         && ! FREETZ_TYPE_ALIEN_HARDWARE 
    848     default y 
     860        ) 
     861    default n 
    849862    help 
    850863        Freenet branding 
     
    852865        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    853866 
    854         NOTE: Make sure to choose at least one branding corresponding to the one 
    855         defined in your box's boot loader environment. It can be determined by calling 
    856         the following command from the box's shell prompt: 
     867        NOTE: Make sure not to remove the branding corresponding to the one defined  
     868        in your box's boot loader environment. It can be determined by calling the 
     869        following command from the box's shell prompt: 
    857870 
    858871        echo $(cat /proc/sys/urlader/firmware_version) 
    859872 
    860 config FREETZ_BRANDING_tcom 
    861     bool "T-Com" 
    862     depends on \ 
    863         FREETZ_TYPE_LANG_DE && \ 
    864         ( \ 
    865         FREETZ_TYPE_300IP_AS_FON || \ 
    866         FREETZ_TYPE_SPEEDPORT_W501V || \ 
    867         FREETZ_TYPE_SPEEDPORT_W701V || \ 
    868         FREETZ_TYPE_SPEEDPORT_W900V || \ 
    869         FREETZ_TYPE_ALIEN_HARDWARE \ 
    870         ) 
    871     default y 
    872     help 
    873         T-Com branding 
    874  
    875         Each branding provides the web UI templates for a certain manufacturer or OEM. 
    876  
    877         NOTE: Make sure to choose at least one branding corresponding to the one 
    878         defined in your box's boot loader environment. It can be determined by calling 
    879         the following command from the box's shell prompt: 
    880  
    881         echo $(cat /proc/sys/urlader/firmware_version) 
     873#config FREETZ_BRANDING_tcom 
     874#   bool "T-Com" 
     875#   depends on \ 
     876#       FREETZ_TYPE_LANG_DE && \ 
     877#       ( \ 
     878#       FREETZ_TYPE_300IP_AS_FON || \ 
     879#       FREETZ_TYPE_SPEEDPORT_W501V || \ 
     880#       FREETZ_TYPE_SPEEDPORT_W701V || \ 
     881#       FREETZ_TYPE_SPEEDPORT_W900V || \ 
     882#       FREETZ_TYPE_ALIEN_HARDWARE \ 
     883#       ) 
     884#   default n 
     885#   help 
     886#       T-Com branding 
     887# 
     888#       Each branding provides the web UI templates for a certain manufacturer or OEM. 
     889# 
     890#       NOTE: Make sure not to remove the branding corresponding to the one defined  
     891#       in your box's boot loader environment. It can be determined by calling the 
     892#       following command from the box's shell prompt: 
     893# 
     894#       echo $(cat /proc/sys/urlader/firmware_version) 
    882895 
    883896config FREETZ_BRANDING_versatel 
     
    885898    depends on \ 
    886899        FREETZ_TYPE_WLAN_3131 
    887     default y 
     900    default n 
    888901    help 
    889902        Versatel branding 
     
    891904        Each branding provides the web UI templates for a certain manufacturer or OEM. 
    892905 
    893         NOTE: Make sure to choose at least one branding corresponding to the one 
    894         defined in your box's boot loader environment. It can be determined by calling 
    895         the following command from the box's shell prompt: 
     906        NOTE: Make sure not to remove the branding corresponding to the one defined  
     907        in your box's boot loader environment. It can be determined by calling the 
     908        following command from the box's shell prompt: 
    896909 
    897910        echo $(cat /proc/sys/urlader/firmware_version) 
    898911 
    899912endmenu 
    900  
    901 comment "Mod ------------------------------------" 
    902  
    903 choice 
    904  
    905     prompt "Language" 
    906     default FREETZ_LANG_DE      if FREETZ_TYPE_LANG_DE 
    907     default FREETZ_LANG_DE      if FREETZ_TYPE_LANG_A_CH 
    908     default FREETZ_LANG_EN      if FREETZ_TYPE_LANG_EN 
    909  
    910     config FREETZ_LANG_DE 
    911         bool "de - deutsch" 
    912  
    913     config FREETZ_LANG_EN 
    914         bool "en - english" 
    915  
    916 endchoice 
    917  
    918 config FREETZ_LANG_STRING 
    919     string 
    920     default "de"            if FREETZ_LANG_DE 
    921     default "en"            if FREETZ_LANG_EN 
    922  
    923 menu "Patches" 
    924913 
    925914config FREETZ_REMOVE_HELP 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.