mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflicts

Browse source
This commit is contained in:
Martin Schröder 2015-06-23 16:26:01 +02:00
parent bb1731286a
commit 2ac60551e5
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brcm_fw_tool/src/brcm_fw_tool.c
View file

@ -913,7 +913,7 @@ int main (int argc, char **argv)
while ((ch = getopt(argc, argv, while ((ch = getopt(argc, argv,
"g:SIMlefriyqjbtkvwW:Z:Vzmoac:d:s:n:h:x:u:p:")) != -1) "g:SIMlefriyqjbtkvwW:Z:Vzmoacd:s:n:h:x:u:p:")) != -1)
switch (ch) { switch (ch) {
case 'I': case 'I':
boot_mode = 1; boot_mode = 1;

4
freecwmp/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cwmp PKG_NAME:=cwmp
PKG_VERSION:=2.3-2015-06-05 PKG_VERSION:=2.3-2015-06-22
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
ifeq ($(CONFIG_PACKAGE_bcmkernel),y) ifeq ($(CONFIG_PACKAGE_bcmkernel),y)
PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/freecwmp.git PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/freecwmp.git
@ -16,7 +16,7 @@ else
PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/freecwmp.git PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/freecwmp.git
endif endif
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=a7e6e655e374662dd2bcb4cbe61fe52357b89799 PKG_SOURCE_VERSION:=e792ada566bb6af6faf46941d72540fb0f0ede95
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

30
iup/files/sbin/iup
View file

@ -15,6 +15,9 @@ export VERBOSE=0
export CONF=1 export CONF=1
export DESKEY=$(cat /proc/nvram/DesKey | hexdump -e '16/1 "%02x"') export DESKEY=$(cat /proc/nvram/DesKey | hexdump -e '16/1 "%02x"')
export MAC=$(cat /proc/nvram/BaseMacAddr) export MAC=$(cat /proc/nvram/BaseMacAddr)
export RANGE=10
export RETRYSTOP=5
export SLEEP=10
#remove whitespace #remove whitespace
MAC=${MAC// /} MAC=${MAC// /}
#lower to upper Conversion #lower to upper Conversion
@ -96,6 +99,11 @@ handle_provisioning() {
local defaultreset local defaultreset
local pack local pack
local packname local packname
local number=$RANDOM
local retry=1
local number
local incsleep=$SLEEP
let "number %= $RANGE"
if [[ ! -e $IUPTEMP ]]; then if [[ ! -e $IUPTEMP ]]; then
mkdir $IUPTEMP mkdir $IUPTEMP
fi fi
@ -107,18 +115,28 @@ handle_provisioning() {
config_get url "$config" url config_get url "$config" url
url=${url//\$MAC/$MAC} url=${url//\$MAC/$MAC}
v "Download from $url" v "Download from $url"
if [ ${url%%:*} == "tftp" ]; then while [ $retry -le $RETRYSTOP ]
do
if [ ${url%%:*} == "tftp" ]; then
tftpfile=${url#*\/\/} tftpfile=${url#*\/\/}
host=${tftpfile%%\/*} host=${tftpfile%%\/*}
tftpfile=${tftpfile#*\/} tftpfile=${tftpfile#*\/}
/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host" /usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
else else
###ugly will remove sleep when backof and retry is implemented
sleep 1
get_image "$url" "cat" > $IUPCONFFILES get_image "$url" "cat" > $IUPCONFFILES
fi fi
if [ -s $IUPCONFFILES ]; then
v "File Downloaded"
retry=$((RETRYSTOP + 1))
else
v "Download failed will try again in $incsleep sec"
sleep $incsleep
incsleep=$((incsleep * retry + number))
retry=$((retry+1))
fi
done
fi fi
if [ ! -s "$IUPCONFFILES" ]; then if [ ! -s "$IUPCONFFILES" ]; then
echo "File not Found" echo "File not Found"