Skip to content

Commit c07ad5c

Browse files
authored
Merge pull request #3323 from chenxuuu/patch-1
fix makeimg.py wrong on linux
2 parents 3906871 + 438397b commit c07ad5c

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

bsp/w60x/makeimg.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ def get_wmlib_path_full(path):
103103
# Setting the makeimg_all.exe file path
104104
makeimg_all_file=wmlib_path_full + '/Tools/makeimg_all.exe'
105105

106+
if (platform.system() == "Linux"):
107+
wm_gzip_file=wmlib_path_full + '/Tools/wm_gzip.py'
108+
makeimg_file=wmlib_path_full + '/Tools/makeimg'
109+
makeimg_all_file=wmlib_path_full + '/Tools/makeimg_all'
110+
106111
# Get absolute path
107112
out_path = os.path.abspath(out_path).replace('\\', '/');
108113
bin_file = os.path.abspath(bin_file).replace('\\', '/');
@@ -149,7 +154,10 @@ def get_wmlib_path_full(path):
149154
print('make_SEC_param' + make_SEC_param)
150155
print('make_FLS_param' + make_FLS_param)
151156

152-
do_makeimg(wm_gzip_file, gzip_param)
157+
if (platform.system() == "Linux"):
158+
do_makeimg("python",wm_gzip_file + " " + gzip_param)
159+
else:
160+
do_makeimg(wm_gzip_file, gzip_param)
153161
do_makeimg(makeimg_file, make_img_param)
154162
do_makeimg(makeimg_file, make_GZ_param)
155163
do_makeimg(makeimg_file, make_SEC_param)
@@ -177,7 +185,10 @@ def get_wmlib_path_full(path):
177185
print('make_SEC_param' + make_SEC_param)
178186
print('make_FLS_param' + make_FLS_param)
179187

180-
do_makeimg(wm_gzip_file, gzip_param)
188+
if (platform.system() == "Linux"):
189+
do_makeimg("python",wm_gzip_file + " " + gzip_param)
190+
else:
191+
do_makeimg(wm_gzip_file, gzip_param)
181192
do_makeimg(makeimg_file, make_img_param)
182193
do_makeimg(makeimg_file, make_GZ_param)
183194
do_makeimg(makeimg_file, make_SEC_param)
@@ -211,4 +222,4 @@ def get_wmlib_path_full(path):
211222
if os.path.exists(rm_file):
212223
os.remove(rm_file)
213224

214-
print('end')
225+
print('end')

0 commit comments

Comments
 (0)