Changeset 14866


Ignorieren:
Zeitstempel:
09.09.2018 20:42:24 (vor 2 Wochen)
Autor:
er13
Nachricht:

fwmod: remove debugging code added in r14840

Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/fwmod

    r14865 r14866  
    17761776 
    17771777    echo0 "packing ${img_name}" 
    1778     "${TAR_FOR_IMAGE_TARBALL}" ${TAR_FOR_IMAGE_TARBALL_FORMAT_OPT} -C "$FIRMWARE_MOD_DIR" -cf "${img_name}${img_name_infix}.unsigned" ./var 
    1779     if [ $? -ne 0 ] || ! is_valid_tarball "${img_name}${img_name_infix}.unsigned"; then 
    1780         mv "${img_name}${img_name_infix}.unsigned" "${img_name}${img_name_infix}.unsigned.corrupted" 2>/dev/null 
     1778    "${TAR_FOR_IMAGE_TARBALL}" ${TAR_FOR_IMAGE_TARBALL_FORMAT_OPT} -C "$FIRMWARE_MOD_DIR" -cf "${img_name}.unsigned" ./var 
     1779    if [ $? -ne 0 ] || ! is_valid_tarball "${img_name}.unsigned"; then 
     1780        mv "${img_name}.unsigned" "${img_name}.unsigned.corrupted" 2>/dev/null 
    17811781        error 1 "packing of firmware image failed" 
    17821782    fi 
    1783     echo1 "unsigned image file size: $(byte_to_mb $(wc -c < "${img_name}${img_name_infix}.unsigned")) ($(wc -c < "${img_name}${img_name_infix}.unsigned") bytes)" 
     1783    echo1 "unsigned image file size: $(byte_to_mb $(wc -c < "${img_name}.unsigned")) ($(wc -c < "${img_name}.unsigned") bytes)" 
    17841784 
    17851785    if [ "$DO_SIGN" -gt 0 ]; then 
     
    17881788            # be verbose if no private key password provided 
    17891789            YF_SIGNIMAGE_TAR="${TAR_FOR_IMAGE_TARBALL}" \ 
    1790             "${TOOLS_DIR}/yf/signimage/sign_image" "${img_name}${img_name_infix}.unsigned" "${FREETZ_FWMOD_SIGN_PRIVATE_KEY_PASSWORD}"                                                > "${img_name}${img_name_infix}.signed" 
     1790            "${TOOLS_DIR}/yf/signimage/sign_image" "${img_name}.unsigned" "${FREETZ_FWMOD_SIGN_PRIVATE_KEY_PASSWORD}"                                                > "${img_name}.signed" 
    17911791        else 
    17921792            YF_SIGNIMAGE_TAR="${TAR_FOR_IMAGE_TARBALL}" \ 
    1793             "${TOOLS_DIR}/yf/signimage/sign_image" "${img_name}${img_name_infix}.unsigned" "${FREETZ_FWMOD_SIGN_PRIVATE_KEY_PASSWORD}" 2>"${MOD_DIR}/sign_image${img_name_infix}.log" > "${img_name}${img_name_infix}.signed" 
    1794         fi 
    1795         if [ $? -ne 0 ] || ! is_valid_tarball "${img_name}${img_name_infix}.signed"; then 
    1796             mv "${img_name}${img_name_infix}.signed" "${img_name}${img_name_infix}.signed.corrupted" 2>/dev/null 
     1793            "${TOOLS_DIR}/yf/signimage/sign_image" "${img_name}.unsigned" "${FREETZ_FWMOD_SIGN_PRIVATE_KEY_PASSWORD}" 2>"${MOD_DIR}/sign_image.log" > "${img_name}.signed" 
     1794        fi 
     1795        if [ $? -ne 0 ] || ! is_valid_tarball "${img_name}.signed"; then 
     1796            mv "${img_name}.signed" "${img_name}.signed.corrupted" 2>/dev/null 
    17971797            error 1 "signing of firmware image failed, see console output or ${MOD_DIR}/sign_image.log for details" 
    17981798        fi 
    1799         echo1 "signed image file size: $(byte_to_mb $(wc -c < "${img_name}${img_name_infix}.signed")) ($(wc -c < "${img_name}${img_name_infix}.signed") bytes)" 
     1799        echo1 "signed image file size: $(byte_to_mb $(wc -c < "${img_name}.signed")) ($(wc -c < "${img_name}.signed") bytes)" 
    18001800    fi 
    18011801 
    18021802    [ "$DO_SIGN" -gt 0 ] && final_img_suffix=signed || final_img_suffix=unsigned 
    18031803    echo0 "using ${final_img_suffix} image as the final one" 
    1804     cp -a "${img_name}${img_name_infix}.${final_img_suffix}" "${img_name}${img_name_infix}" 
     1804    cp -a "${img_name}.${final_img_suffix}" "${img_name}" 
    18051805 
    18061806    # delete temporary unsigned/signed files unless we're debugging 
    1807     [ "$DEBUG" != "1" ] && rm -f "${img_name}${img_name_infix}.unsigned" "${img_name}${img_name_infix}.signed" 
     1807    [ "$DEBUG" != "1" ] && rm -f "${img_name}.unsigned" "${img_name}.signed" 
    18081808fi 
    18091809 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.