Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-09 02:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/jungo-image: convert to Python 3 with 2-to-3

Browse Source 
Let's convert the script to Python 3.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2019-03-19 10:30:34 +00:00
parent e785da815b
commit 57bb89b57f
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# #
# Copyright 2008, 2009 (C) Jose Vasconcellos <jvasco@verizon.net> # Copyright 2008, 2009 (C) Jose Vasconcellos <jvasco@verizon.net>
# #
@ -32,9 +32,9 @@ import telnetlib
import string import string
import binascii import binascii
import socket import socket
import thread import _thread
import SocketServer import socketserver
import SimpleHTTPServer import http.server
reboot = 0 reboot = 0
HOST = "192.168.1.1" HOST = "192.168.1.1"
@ -56,8 +56,8 @@ device="ixp0"
#################### ####################
def start_server(server): def start_server(server):
httpd = SocketServer.TCPServer((server,PORT),SimpleHTTPServer.SimpleHTTPRequestHandler) httpd = socketserver.TCPServer((server,PORT),http.server.SimpleHTTPRequestHandler)
thread.start_new_thread(httpd.serve_forever,()) _thread.start_new_thread(httpd.serve_forever,())
#################### ####################
@ -66,11 +66,11 @@ def get_flash_size():
tn.write("cat /proc/cpuinfo\n") tn.write("cat /proc/cpuinfo\n")
buf = tn.read_until("Returned 0", 3) buf = tn.read_until("Returned 0", 3)
if not buf: if not buf:
print "Unable to obtain CPU information; make sure to not use A0 stepping!" print("Unable to obtain CPU information; make sure to not use A0 stepping!")
elif buf.find('rev 0') > 0: elif buf.find('rev 0') > 0:
print "Warning: IXP42x stepping A0 detected!" print("Warning: IXP42x stepping A0 detected!")
if imagefile or url: if imagefile or url:
print "Error: No linux support for A0 stepping!" print("Error: No linux support for A0 stepping!")
sys.exit(2) sys.exit(2)
# now get flash size # now get flash size
@ -86,9 +86,9 @@ def get_flash_size():
i = buf.rfind('Range ') i = buf.rfind('Range ')
if i > 0: if i > 0:
return int(buf[i+17:].split()[0],16) return int(buf[i+17:].split()[0],16)
print "Can't determine flash size!" print("Can't determine flash size!")
else: else:
print "Unable to obtain flash size!" print("Unable to obtain flash size!")
sys.exit(2) sys.exit(2)
def image_dump(tn, dumpfile): def image_dump(tn, dumpfile):
@ -110,13 +110,13 @@ def image_dump(tn, dumpfile):
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")
print "Dumping flash contents (%dMB) to %s" % (flashsize/1048576, dumpfile) print("Dumping flash contents (%dMB) to %s" % (flashsize/1048576, dumpfile))
f = open(dumpfile, "wb") f = open(dumpfile, "wb")
t=flashsize/dumplen t=flashsize/dumplen
@ -137,7 +137,7 @@ def image_dump(tn, dumpfile):
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:],'')))
@ -145,7 +145,7 @@ def image_dump(tn, dumpfile):
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))
@ -156,11 +156,11 @@ def telnet_option(sock,cmd,option):
sock.sendall(telnetlib.IAC + c + option) sock.sendall(telnetlib.IAC + c + option)
def telnet_timeout(): def telnet_timeout():
print "Fatal error: telnet timeout!" print("Fatal error: telnet timeout!")
sys.exit(1) sys.exit(1)
def usage(): def usage():
print __doc__ % os.path.basename(sys.argv[0]) print(__doc__ % os.path.basename(sys.argv[0]))
#################### ####################
@ -178,7 +178,7 @@ for o, a in opts:
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
@ -213,8 +213,8 @@ else:
# create a telnet session to the router # create a telnet session to the router
try: try:
tn = telnetlib.Telnet(HOST) tn = telnetlib.Telnet(HOST)
except socket.error, msg: except socket.error as msg:
print "Unable to establish telnet session to %s: %s" % (HOST, msg) print("Unable to establish telnet session to %s: %s" % (HOST, msg))
sys.exit(1) sys.exit(1)
tn.set_option_negotiation_callback(telnet_option) tn.set_option_negotiation_callback(telnet_option)
@ -250,7 +250,7 @@ if imagefile or url:
cmd = "load -u http://%s:%d/%s -r 0\n" % (server, PORT, splitpath[1]) cmd = "load -u http://%s:%d/%s -r 0\n" % (server, PORT, splitpath[1])
if not os.access(imagefile, os.R_OK): if not os.access(imagefile, os.R_OK):
print "File access error: %s" % (imagefile) print("File access error: %s" % (imagefile))
sys.exit(3) sys.exit(3)
# make sure we're in the directory where the image is located # make sure we're in the directory where the image is located
@ -260,23 +260,23 @@ 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, print(cmd, end=' ')
tn.write(cmd) tn.write(cmd)
buf = tn.read_until("Returned 0",10) buf = tn.read_until("Returned 0",10)
# 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...")
tn.write("exit\n") tn.write("exit\n")
tn.close() tn.close()