Changeset 7421


Ignorieren:
Zeitstempel:
28.07.2011 17:52:56 (vor 6 Jahren)
Autor:
oliver
Nachricht:
  • Rename some config symbols (by dileks)
Ort:
trunk
Dateien:
10 bearbeitet

Legende:

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

    r7398 r7421  
    243243endchoice 
    244244 
    245 config FREETZ_TYPE_LANG_STRING 
     245config FREETZ_TYPE_LANGUAGE 
    246246    string 
    247247    default "de"        if FREETZ_TYPE_LANG_DE 
     
    444444endchoice 
    445445 
    446 config FREETZ_TYPE_STRING 
     446config FREETZ_TYPE_PREFIX 
    447447    string 
    448448    default "300ip_as_fon"                  if FREETZ_TYPE_300IP_AS_FON 
     
    492492    default "custom"                    if FREETZ_TYPE_CUSTOM 
    493493 
    494 config FREETZ_TYPE_STRING2 
     494config FREETZ_TYPE_PREFIX_ALIEN_HARDWARE 
    495495    string 
    496496    default "W500V_"                    if FREETZ_TYPE_SINUS_W500V_7150 
  • trunk/Makefile

    r7199 r7421  
    339339ifneq ($(FWMOD_NOPACK),y) 
    340340ifeq ($(strip $(FREETZ_CUSTOM_IMAGE_NAME_PREFIX)),y) 
    341     @mv $(BUILD_DIR)/*_$(FREETZ_TYPE_STRING2)$(FREETZ_TYPE_STRING)* ./$(FW_IMAGES_DIR) 
     341    @mv $(BUILD_DIR)/*_$(FREETZ_TYPE_PREFIX_ALIEN_HARDWARE)$(FREETZ_TYPE_PREFIX)* ./$(FW_IMAGES_DIR) 
    342342else 
    343     @mv $(BUILD_DIR)/$(FREETZ_TYPE_STRING2)$(FREETZ_TYPE_STRING)* ./$(FW_IMAGES_DIR) 
     343    @mv $(BUILD_DIR)/$(FREETZ_TYPE_PREFIX_ALIEN_HARDWARE)$(FREETZ_TYPE_PREFIX)* ./$(FW_IMAGES_DIR) 
    344344endif 
    345345endif 
  • trunk/fwmod

    r7328 r7421  
    402402    echo0 "applying patches" 
    403403 
    404     echo1 "applying patches (${FREETZ_TYPE_STRING}-${FREETZ_TYPE_LANG_STRING})" 
     404    echo1 "applying patches (${FREETZ_TYPE_PREFIX}-${FREETZ_TYPE_LANGUAGE})" 
    405405 
    406406    # Apply patches 
    407     if [ ! -d "${PATCHES_DIR}/${FREETZ_TYPE_STRING}" ]; then 
    408         error 1 "missing ${PATCHES_DIR}/${FREETZ_TYPE_STRING}" 
     407    if [ ! -d "${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}" ]; then 
     408        error 1 "missing ${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}" 
    409409    fi 
    410410 
    411411    # Execute version specific patch scripts 
    412     for i in "${PATCHES_DIR}/${FREETZ_TYPE_STRING}/${FREETZ_TYPE_LANG_STRING}/"*.sh \ 
    413         "${PATCHES_DIR}/${FREETZ_TYPE_STRING}/"*.sh; do 
     412    for i in "${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}/${FREETZ_TYPE_LANGUAGE}/"*.sh \ 
     413        "${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}/"*.sh; do 
    414414        [ -r "$i" ] || continue 
    415415        echo2 "applying patch file $i" 
     
    430430    shopt -s nullglob 
    431431    for i in "${PATCHES_DIR}/"*.patch \ 
    432         "${PATCHES_DIR}/${FREETZ_TYPE_STRING}/"*.patch \ 
    433         "${PATCHES_DIR}/${FREETZ_TYPE_STRING}/${FREETZ_TYPE_LANG_STRING}/"*.patch 
     432        "${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}/"*.patch \ 
     433        "${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}/${FREETZ_TYPE_LANGUAGE}/"*.patch 
    434434    do 
    435435        modpatch "$FILESYSTEM_MOD_DIR" "$i" 
     
    952952 
    953953    modmakedate=$(date +%Y%m%d-%H%M%S) 
    954     modbaseimagename="${FREETZ_TYPE_STRING2}${FREETZ_TYPE_STRING}_${FIRMWAREVERSION}${SUBVERSION}.${FREETZ_TYPE_LANG_STRING}" 
     954    modbaseimagename="${FREETZ_TYPE_PREFIX_ALIEN_HARDWARE}${FREETZ_TYPE_PREFIX}_${FIRMWAREVERSION}${SUBVERSION}.${FREETZ_TYPE_LANGUAGE}" 
    955955    if [ "$FREETZ_CUSTOM_IMAGE_NAME" == "y" -a ! -z "$FREETZ_USER_DEFINED_COMMENT" ]; then 
    956956        modcustomimagestring=$(echo $FREETZ_USER_DEFINED_COMMENT | sed -e "s/ /_/g" | tr -cd 'a-zA-Z0-9_+-.<->') 
     
    975975    echo1 "integrate freetz info file into image" 
    976976    freetz_info_file="$MOD_DIR/filesystem/etc/freetz_info.cfg" 
    977     echo "export FREETZ_INFO_BOXTYPE='${FREETZ_TYPE_STRING2}${FREETZ_TYPE_STRING}'" > "$freetz_info_file" 
     977    echo "export FREETZ_INFO_BOXTYPE='${FREETZ_TYPE_PREFIX_ALIEN_HARDWARE}${FREETZ_TYPE_PREFIX}'" > "$freetz_info_file" 
    978978    echo "export FREETZ_INFO_FIRMWAREVERSION='${FIRMWAREVERSION}'" >> "$freetz_info_file" 
    979979    echo "export FREETZ_INFO_SUBVERSION='${SUBVERSION}'" >> "$freetz_info_file" 
    980     echo "export FREETZ_INFO_LANG='${FREETZ_TYPE_LANG_STRING}'" >> "$freetz_info_file" 
     980    echo "export FREETZ_INFO_LANG='${FREETZ_TYPE_LANGUAGE}'" >> "$freetz_info_file" 
    981981    echo "export FREETZ_INFO_MAKEDATE='$modmakedate'" >> "$freetz_info_file" 
    982982    echo "export FREETZ_INFO_IMAGE_NAME='$modimage'" >> "$freetz_info_file" 
  • trunk/make/mdev/mdev.mk

    r5892 r7421  
    1515$(PKG)_DEPENDS_ON := e2fsprogs 
    1616 
    17 $(PKG)_REBUILD_SUBOPTS := FREETZ_TYPE_STRING 
     17$(PKG)_REBUILD_SUBOPTS := FREETZ_TYPE_PREFIX 
    1818 
    1919$(PKG_UNPACKED) 
     
    2828 
    2929$($(PKG)_TARGET_DIR)/.patch_model: $($(PKG)_TARGET_MODPROBE_CONF) 
    30     @freetz_type=$$(echo $(FREETZ_TYPE_STRING) | $(SED) 's/_.*//'); \ 
     30    @freetz_type=$$(echo $(FREETZ_TYPE_PREFIX) | $(SED) 's/_.*//'); \ 
    3131    for f in $(MDEV_MAKE_DIR)/patches/hardware/$${freetz_type}_*.patch; do \ 
    3232        if [ -r $$f ]; then \ 
    3333            set -e; $(PATCH_TOOL) $(MDEV_TARGET_DIR) $$f; \ 
    3434        else \ 
    35             echo unsupported model $(FREETZ_TYPE_STRING) 2>&1; \ 
     35            echo unsupported model $(FREETZ_TYPE_PREFIX) 2>&1; \ 
    3636            exit 1; \ 
    3737        fi \ 
  • trunk/patches/191-webmenu_wol.sh

    r1994 r7421  
    11[ "$FREETZ_PACKAGE_WOL_CGI" == "y" ] || return 0 
    22echo1 "applying wol patch" 
    3 modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANG_STRING}/webmenu-wol-${FREETZ_TYPE_STRING}.patch" 
     3modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANGUAGE}/webmenu-wol-${FREETZ_TYPE_PREFIX}.patch" 
    44 
  • trunk/patches/220-assistant.sh

    r6257 r7421  
    2020if [ -e "$HTML_DIR/home/sitemap.html" ]; then 
    2121    if isFreetzType 3270 3270_V3 7112 7141 7150 7170 7240 7270 7320 7340 7390 7570; then 
    22         modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANG_STRING}/remove_assistant_${FREETZ_TYPE_STRING}.patch" 
     22        modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANGUAGE}/remove_assistant_${FREETZ_TYPE_PREFIX}.patch" 
    2323    elif isFreetzType 7140; then 
    2424        if isFreetzType LANG_A_CH; then 
  • trunk/patches/300ip_as_fon/200-tk-firmware.sh

    r3884 r7421  
    11# executing sh according to language / version 
    2 . "${PATCHES_DIR}/${FREETZ_TYPE_STRING}/200-tk-firmware-${FREETZ_TYPE_LANG_STRING}" 
     2. "${PATCHES_DIR}/${FREETZ_TYPE_PREFIX}/200-tk-firmware-${FREETZ_TYPE_LANGUAGE}" 
  • trunk/patches/470-volumecounter.sh

    r3683 r7421  
    33# 
    44#echo1 "adding volume counter" 
    5 #   modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/de/470-volumecounter_${FREETZ_TYPE_STRING}.patch" 
     5#   modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/de/470-volumecounter_${FREETZ_TYPE_PREFIX}.patch" 
    66# 
    77#modsed "s/CONFIG_VOL_COUNTER=\"n\"/CONFIG_VOL_COUNTER=\"y\"/g" "${FILESYSTEM_MOD_DIR}/etc/init.d/rc.conf" 
  • trunk/patches/480-alarmclock.sh

    r7169 r7421  
    22echo1 "adding alarm-clock" 
    33 
    4 modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANG_STRING}/480-alarmclock_${FREETZ_TYPE_STRING}.patch" 
     4modpatch "$FILESYSTEM_MOD_DIR" "${PATCHES_DIR}/cond/${FREETZ_TYPE_LANGUAGE}/480-alarmclock_${FREETZ_TYPE_PREFIX}.patch" 
    55 
  • trunk/patches/7150/100-w500v_7150.sh

    r3884 r7421  
    5555 
    5656echo2 "patching webinterface" 
    57 HTML_DIR="${HTML_LANG_MOD_DIR}/html/${FREETZ_TYPE_LANG_STRING}" 
     57HTML_DIR="${HTML_LANG_MOD_DIR}/html/${FREETZ_TYPE_LANGUAGE}" 
    5858sed -i -e "s/g_txtmld_/g_txtMld_/g" "${HTML_DIR}/fon/foncalls.js" 
    5959sed -i -e "s/<? setvariable var:showtcom 0 ?>/<? setvariable var:showtcom 1 ?>/g" "${HTML_DIR}/fon/sip1.js" 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.