mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "pack.py: Fixed missing '/' in the file path"

Browse source
This commit is contained in:
Linux Build Service Account 2019-01-31 11:06:36 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3eaa13f338
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/pack.py
View file

@ -1622,7 +1622,7 @@ def gen_kernelboot_img(parser):
"""Generate kernelboot.img needed by LK bootloader"""
SKALES_DIR = parser.images_dname
TMP_DIR = parser.out_dname + "tmp_dir"
TMP_DIR = parser.out_dname + "/tmp_dir"
try:
@ -1635,17 +1635,17 @@ def gen_kernelboot_img(parser):
else:
KERNEL_IMG_NAME = "openwrt-" + ARCH_NAME + "-kernelboot.img"
src = parser.images_dname + "qcom-" + ARCH_NAME + "-hk01.dtb"
src = parser.images_dname + "/qcom-" + ARCH_NAME + "-hk01.dtb"
if not os.path.exists(src):
error("%s file not found" % src)
copy(src, TMP_DIR)
src = parser.images_dname + "Image"
src = parser.images_dname + "/Image"
if not os.path.exists(src):
error("%s file not found" % src)
copy(src, TMP_DIR)
cmd = [SKALES_DIR + "dtbTool -o " + TMP_DIR + "/qcom-ipq807x-hk01-dt.img " + TMP_DIR]
cmd = [SKALES_DIR + "/dtbTool -o " + TMP_DIR + "/qcom-ipq807x-hk01-dt.img " + TMP_DIR]
ret = subprocess.call(cmd, shell=True)
if ret != 0:
print ret
@ -1657,11 +1657,11 @@ def gen_kernelboot_img(parser):
print ret
error("Error executing gzip")
cmd = [SKALES_DIR + "mkbootimg",
cmd = [SKALES_DIR + "/mkbootimg",
"--kernel=" + TMP_DIR + "/Image.gz",
"--dt=" + TMP_DIR + "/qcom-ipq807x-hk01-dt.img",
"--cmdline=\'rootfsname=rootfs rootwait nosmp\'",
"--output=" + parser.out_dname + KERNEL_IMG_NAME,
"--output=" + parser.out_dname + "/" + KERNEL_IMG_NAME,
"--base=0x41200000"]
ret = subprocess.call(cmd)
if ret != 0:

6
tools/pack_legacy.py
View file

@ -735,10 +735,10 @@ class Pack(object):
rmtree(self.tmp_dir)
os.makedirs(self.tmp_dir)
copy(self.images_dname + DTB, self.tmp_dir)
copy(self.images_dname + "Image", self.tmp_dir)
copy(self.images_dname + "/" + DTB, self.tmp_dir)
copy(self.images_dname + "/Image", self.tmp_dir)
cmd = [SKALES_DIR + "dtbTool -o " + self.tmp_dir + "/" + DTB + ".img " + self.tmp_dir]
cmd = [SKALES_DIR + "/dtbTool -o " + self.tmp_dir + "/" + DTB + ".img " + self.tmp_dir]
ret = subprocess.call(cmd, shell=True)
if ret != 0:
print ret