[ifxmips]

merge [22957] in backfire

extracted firmware files were generated with an incorrect umask

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22958 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ifx-vmmc/Makefile b/package/ifx-vmmc/Makefile
index 0fa3649e9cafb66228d1a20449bb46f9eab137e6..07f2b4c4d33fc8217bcaf5afca693f2439188d18 100644 (file)
--- a/package/ifx-vmmc/Makefile
+++ b/package/ifx-vmmc/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2008 OpenWrt.org
+f      # Copyright (C) 2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -100,9 +100,9 @@ endif
 
 ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
 define Download/decode
 
 ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
 define Download/decode

-  FILE:=ifxmips_fw_decode.tar.bz2
+  FILE:=ifxmips_fw_decodev2.tar.bz2

   URL:=http://downloads.openwrt.org/sources/
   URL:=http://downloads.openwrt.org/sources/

-  MD5SUM:=1197ff6cace6a7c86492a468f5fbfe07
+  MD5SUM:=9f4ebfae5cb9d9e8fca46057a653ae27

 endef
 $(eval $(call Download,decode))
 endif
 endef
 $(eval $(call Download,decode))
 endif

diff --git a/target/linux/ifxmips/extract.sh b/target/linux/ifxmips/extract.sh
index 7b1c1da0b1a47bc5bcdd031745a61782c00786fa..52dfbd56ea5d98bf66d139437ab4a0513ca8b3d0 100755 (executable)
--- a/target/linux/ifxmips/extract.sh
+++ b/target/linux/ifxmips/extract.sh
@@ -11,9 +11,9 @@ echo "Please only do so if it is legal in your country"
        exit 1
 }
 
        exit 1
 }
 

-[ -f ${DIR}/ifxmips_fw_decode.tar.bz2 -a ! -f ${DIR}voip_coef.bin ] && {
+[ -f ${DIR}/ifxmips_fw_decodev2.tar.bz2 -a ! -f ${DIR}voip_coef.bin ] && {

        [ ! -f ${DIR}decode_ifx_fw ] && {
        [ ! -f ${DIR}decode_ifx_fw ] && {

-               tar xjf ${DIR}ifxmips_fw_decode.tar.bz2 ifxmips_fw_decode/decode.c -O > ${DIR}decode.c
+               tar xjf ${DIR}ifxmips_fw_decodev2.tar.bz2 ifxmips_fw_decode/decode.c -O > ${DIR}decode.c

                gcc -o ${DIR}decode_ifx_fw ${DIR}decode.c
        }
        [ ! -f ${DIR}voip_coef.lzma ] && {
                gcc -o ${DIR}decode_ifx_fw ${DIR}decode.c
        }
        [ ! -f ${DIR}voip_coef.lzma ] && {