Changeset 13843


Ignorieren:
Zeitstempel:
30.07.2016 19:42:02 (vor 16 Monaten)
Autor:
er13
Nachricht:

7490:

Ort:
trunk
Dateien:
3 hinzugefügt
4 bearbeitet
1 kopiert

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/FIRMWARES

    r13814 r13843  
    272272    * 113.06.30 rev30889 
    273273    * 113.06.60 rev33668 
     274    * 113.06.69 rev40416 (Labor) 
    274275    * 113.06.04 rev27507 (International) 
    275276    * 113.06.31 rev32500 (International & International/Belgian) 
  • trunk/config/avm/availability.in

    r13814 r13843  
    258258config FREETZ_AVM_HAS_FIRMWARE_LABOR 
    259259    bool "Labor firmware available" if FREETZ_TYPE_CUSTOM 
    260 #   default y       if \ 
    261 #       FREETZ_TYPE_LANG_DE && ( \ 
    262 #           FREETZ_TYPE_7490 \ 
    263 #       ) 
     260    default y       if \ 
     261        FREETZ_TYPE_LANG_DE && ( \ 
     262            FREETZ_TYPE_7490 \ 
     263        ) 
    264264    default n 
    265265    help 
  • trunk/config/mod/download.in

    r13814 r13843  
    385385        default "@AVM/fritzbox.7490/firmware/english"                           if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_5X 
    386386        default "@AVM/fritzbox.7490/firmware/belgium"                           if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN_BE && FREETZ_TYPE_FIRMWARE_06_0X 
    387 #       default "@AVM/fileadmin/user_upload/DE/Labor/Download,@AVM/beta"        if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7490 
     387        default "@AVM/fileadmin/user_upload/DE/Labor/Download,@AVM/beta"        if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7490 
    388388        # 
    389389        default "@AVM/fritzbox.fon_wlan_7570/firmware/english"                  if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7570 && ! FREETZ_TYPE_7570_7270 
     
    623623        default "FRITZ.Box_7490.en-de-es-it-fr-pl.113.06.52.image"              if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_FIRMWARE_06_5X 
    624624        default "FRITZ.Box_7490.en-de-es-it-fr-pl.113.06.06.image"              if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7490 && FREETZ_TYPE_LANG_EN_BE && FREETZ_TYPE_FIRMWARE_06_0X 
     625        default "FRITZ.Box_7490_Labor.113.06.69-40416.image"                    if FREETZ_TYPE_FIRMWARE_LABOR && FREETZ_TYPE_7490 
    625626        # 
    626627        default "FRITZ.Box_Fon_WLAN_7570_vDSL.en-de-fr.75.04.92.image"          if FREETZ_TYPE_FIRMWARE_FINAL && FREETZ_TYPE_7570 && ! FREETZ_TYPE_7570_7270 
     
    868869    config FREETZ_DL_SOURCE_CONTAINER 
    869870        string "Downloaded container file"              if FREETZ_DL_OVERRIDE 
     871        default "fritzbox-labor-7490-40416.zip"         if FREETZ_TYPE_7490         && FREETZ_TYPE_FIRMWARE_LABOR 
    870872        default "" 
    871873 
    872874    config FREETZ_DL_SOURCE_CONTAINER_MD5 
    873875        string "MD5 checksum for container"             if FREETZ_DL_OVERRIDE 
     876        default "e6fbe4428e71f52a541cdff03cec3b41"      if FREETZ_TYPE_7490         && FREETZ_TYPE_FIRMWARE_LABOR 
    874877        default "" 
    875878 
  • trunk/patches/cond/enable_led_deactivation-06_5X_labor.patch

    r13841 r13843  
    11--- usr/www/avm/menus/menu_data.lua 
    22+++ usr/www/avm/menus/menu_data.lua 
    3 @@ -498,6 +498,12 @@ 
     3@@ -550,6 +550,12 @@ 
    44 ["lua"] = "system/infoled.lua", 
    55 ["help"] = forLuaOnly and "hilfe_system_infoanzeige" 
    6  } or nil 
     6 } or nil, 
    77+-- TODO: untested, check if "led" is the right key and if adding pageData["led"] is enough 
    8 +pageData["led"] = { 
    9 +["show"] = gExpertMode, 
     8+["led"] = { 
     9+["show"] = data.expertMode, 
    1010+["lua"] = "system/led_display.lua", 
    1111+["help"] = forLuaOnly and "hilfe_system_anzeige" 
    12 +} or nil 
    13  pageData["keyLo"] = { 
     12+} or nil, 
     13 ["keyLo"] = { 
    1414 ["show"] = true, 
    1515 ["lua"] = "system/keylock.lua", 
    16 @@ -2013,6 +2019,7 @@ 
     16@@ -2063,6 +2069,7 @@ 
    1717 ["par"] = "mfn", 
    1818 ["pos"] = 10 
    19  } or nil 
     19 } or nil, 
    2020+-- AVM defines menuData["led"] but never defines pageData["led"], we make this entry work by defining pageData["led"] 
    21  menuData["led"] = pageData["led"] and { 
     21 ["led"] = pageData["led"] and { 
    2222 ["txt"] = TXT([[{?menuLed?}]]), 
    2323 ["par"] = "mfn", 
  • trunk/patches/scripts/535-enable_led_deactivation.sh

    r13357 r13843  
    22 
    33echo1 "re-adding LED (de-)activation page" 
    4 modpatch "${FILESYSTEM_MOD_DIR}" "${PATCHES_COND_DIR}/enable_led_deactivation-${FREETZ_TYPE_PREFIX_SERIES_SUBDIR}.patch" 
     4modpatch "${FILESYSTEM_MOD_DIR}" "${PATCHES_COND_DIR}/enable_led_deactivation-${FREETZ_TYPE_PREFIX_SERIES_SUBDIR}${FREETZ_TYPE_PREFIX_LABOR_FIRMWARE}.patch" 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.