him411/immortalwrt-VIKINGYFY
1
0
Fork 0
mirror of https://github.com/VIKINGYFY/immortalwrt.git synced 2025-12-16 17:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/jungo-image: Fix up whitespace

Browse Source 
Recent Python versions are strict about whitespace and will
complain about mixtures of tabs and spaces. Convert any tabs
so the script just use spaces for indentation.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://github.com/openwrt/openwrt/pull/21116
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Linus Walleij 2025-06-19 14:07:34 +02:00 committed by Christian Marangi
parent 9e9206427f
commit 1c7ec8ab19
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
scripts/flashing/jungo-image.py
View File

@ -97,21 +97,21 @@ def image_dump(tn, dumpfile):
buf = tn.read_until("Returned 0",2) buf = tn.read_until("Returned 0",2)
i = buf.find("Platform:") i = buf.find("Platform:")
if i < 0: if i < 0:
platform="jungo" platform="jungo"
else: else:
line=buf[i+9:] line=buf[i+9:]
i=line.find('\n') i=line.find('\n')
platform=line[:i].split()[-1] platform=line[:i].split()[-1]
tn.write("rg_conf_print /dev/%s/mac\n" % device); tn.write("rg_conf_print /dev/%s/mac\n" % device);
buf = tn.read_until("Returned 0",3) buf = tn.read_until("Returned 0",3)
i = buf.find("mac(") i = buf.find("mac(")
if i > 0: if i > 0:
i += 4 i += 4
else: else:
print("No MAC address found! (use -f option)") print("No MAC address found! (use -f option)")
sys.exit(1) sys.exit(1)
dumpfile = "%s-%s.bin" % (platform, buf[i:i+17].replace(':','')) dumpfile = "%s-%s.bin" % (platform, buf[i:i+17].replace(':',''))
else: else:
tn.write("\n") tn.write("\n")
@ -121,31 +121,31 @@ def image_dump(tn, dumpfile):
t=flashsize/dumplen t=flashsize/dumplen
for addr in range(t): for addr in range(t):
if verbose: if verbose:
sys.stdout.write('\r%d%%'%(100*addr/t)) sys.stdout.write('\r%d%%'%(100*addr/t))
sys.stdout.flush() sys.stdout.flush()
tn.write("flash_dump -r 0x%x -l %d -4\n" % (addr*dumplen, dumplen)) tn.write("flash_dump -r 0x%x -l %d -4\n" % (addr*dumplen, dumplen))
tn.read_until("\n") tn.read_until("\n")
count = addr*dumplen count = addr*dumplen
while 1: while 1:
buf = tn.read_until("\n") buf = tn.read_until("\n")
if buf.strip() == "Returned 0": if buf.strip() == "Returned 0":
break break
s = buf.split() s = buf.split()
if s and s[0][-1] == ':': if s and s[0][-1] == ':':
a=int(s[0][:-1],16) a=int(s[0][:-1],16)
if a != count: if a != count:
print("Format error: %x != %x"%(a,count)) print("Format error: %x != %x"%(a,count))
sys.exit(2) sys.exit(2)
count += 16 count += 16
f.write(binascii.a2b_hex(string.join(s[1:],''))) f.write(binascii.a2b_hex(string.join(s[1:],'')))
tn.read_until(">",1) tn.read_until(">",1)
f.close() f.close()
if verbose: if verbose:
print("") print("")
def telnet_option(sock,cmd,option): def telnet_option(sock,cmd,option):
#print "Option: %d %d" % (ord(cmd), ord(option)) #print "Option: %d %d" % (ord(cmd), ord(option))
@ -175,27 +175,27 @@ except getopt.GetoptError:
for o, a in opts: for o, a in opts:
if o in ("-h", "--help"): if o in ("-h", "--help"):
usage() usage()
sys.exit(1) sys.exit(1)
elif o in ("-V", "--version"): elif o in ("-V", "--version"):
print("%s: 0.11" % sys.argv[0]) print("%s: 0.11" % sys.argv[0])
sys.exit(1) sys.exit(1)
elif o in ("-d", "--no-dump"): elif o in ("-d", "--no-dump"):
do_dump = 1 do_dump = 1
elif o in ("-f", "--file"): elif o in ("-f", "--file"):
dumpfile = a dumpfile = a
elif o in ("-u", "--user"): elif o in ("-u", "--user"):
user = a user = a
elif o in ("-p", "--pass"): elif o in ("-p", "--pass"):
password = a password = a
elif o == "--port": elif o == "--port":
PORT = int(a) PORT = int(a)
elif o in ("-q", "--quiet"): elif o in ("-q", "--quiet"):
verbose = 0 verbose = 0
elif o in ("-r", "--reboot"): elif o in ("-r", "--reboot"):
reboot = 1 reboot = 1
elif o in ("-v", "--verbose"): elif o in ("-v", "--verbose"):
verbose = 1 verbose = 1
# make sure we have enough arguments # make sure we have enough arguments
if len(args) > 0: if len(args) > 0:
@ -260,12 +260,12 @@ if imagefile or url:
start_server(server) start_server(server)
if verbose: if verbose:
print("Unlocking flash...") print("Unlocking flash...")
tn.write("unlock 0 0x%x\n" % flashsize) tn.write("unlock 0 0x%x\n" % flashsize)
buf = tn.read_until("Returned 0",5) buf = tn.read_until("Returned 0",5)
if verbose: if verbose:
print("Writing new image...") print("Writing new image...")
print(cmd, end=' ') print(cmd, end=' ')
tn.write(cmd) tn.write(cmd)
buf = tn.read_until("Returned 0",10) buf = tn.read_until("Returned 0",10)
@ -273,7 +273,7 @@ if imagefile or url:
# wait till the transfer completed # wait till the transfer completed
buf = tn.read_until("Download completed successfully",20) buf = tn.read_until("Download completed successfully",20)
if buf: if buf:
print("Flash update complete!") print("Flash update complete!")
if reboot: if reboot:
tn.write("reboot\n") tn.write("reboot\n")
print("Rebooting...") print("Rebooting...")