libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3323 from chenxuuu/patch-1 

fix makeimg.py wrong on linux
This commit is contained in:
Bernard Xiong 2020-01-14 09:51:11 +08:00 committed by GitHub
parent 390687122e 438397b586
commit c07ad5c24f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bsp/w60x/makeimg.py
View File

@ -103,6 +103,11 @@ if __name__=='__main__':
# Setting the makeimg_all.exe file path # Setting the makeimg_all.exe file path
makeimg_all_file=wmlib_path_full + '/Tools/makeimg_all.exe' makeimg_all_file=wmlib_path_full + '/Tools/makeimg_all.exe'
if (platform.system() == "Linux"):
wm_gzip_file=wmlib_path_full + '/Tools/wm_gzip.py'
makeimg_file=wmlib_path_full + '/Tools/makeimg'
makeimg_all_file=wmlib_path_full + '/Tools/makeimg_all'
# Get absolute path # Get absolute path
out_path = os.path.abspath(out_path).replace('\\', '/'); out_path = os.path.abspath(out_path).replace('\\', '/');
bin_file = os.path.abspath(bin_file).replace('\\', '/'); bin_file = os.path.abspath(bin_file).replace('\\', '/');
@ -149,7 +154,10 @@ if __name__=='__main__':
print('make_SEC_param' + make_SEC_param) print('make_SEC_param' + make_SEC_param)
print('make_FLS_param' + make_FLS_param) print('make_FLS_param' + make_FLS_param)
do_makeimg(wm_gzip_file, gzip_param) if (platform.system() == "Linux"):
do_makeimg("python",wm_gzip_file + " " + gzip_param)
else:
do_makeimg(wm_gzip_file, gzip_param)
do_makeimg(makeimg_file, make_img_param) do_makeimg(makeimg_file, make_img_param)
do_makeimg(makeimg_file, make_GZ_param) do_makeimg(makeimg_file, make_GZ_param)
do_makeimg(makeimg_file, make_SEC_param) do_makeimg(makeimg_file, make_SEC_param)
@ -177,7 +185,10 @@ if __name__=='__main__':
print('make_SEC_param' + make_SEC_param) print('make_SEC_param' + make_SEC_param)
print('make_FLS_param' + make_FLS_param) print('make_FLS_param' + make_FLS_param)
do_makeimg(wm_gzip_file, gzip_param) if (platform.system() == "Linux"):
do_makeimg("python",wm_gzip_file + " " + gzip_param)
else:
do_makeimg(wm_gzip_file, gzip_param)
do_makeimg(makeimg_file, make_img_param) do_makeimg(makeimg_file, make_img_param)
do_makeimg(makeimg_file, make_GZ_param) do_makeimg(makeimg_file, make_GZ_param)
do_makeimg(makeimg_file, make_SEC_param) do_makeimg(makeimg_file, make_SEC_param)
@ -211,4 +222,4 @@ if __name__=='__main__':
if os.path.exists(rm_file): if os.path.exists(rm_file):
os.remove(rm_file) os.remove(rm_file)
print('end') print('end')