andreil/SBC_builder
1
0
Fork 0
mirror of https://github.com/andreili/SBC_builder.git synced 2025-08-23 19:04:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Installation fixes.

Browse Source
This commit is contained in:
andreili 2025-08-18 22:11:19 +02:00
parent 1383d18ecc
commit ee2dc421bc
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/board/btt_pi2.json
View File

@ -49,6 +49,10 @@
"store_type": "dd", "store_type": "dd",
"block_size": "512b", "block_size": "512b",
"img_offset": 16384 "img_offset": 16384
},
{
"file": "u-boot-rockchip-spi.bin",
"store_type": "temp"
} }
], ],
"target": [ "" ], "target": [ "" ],
@ -71,11 +75,6 @@
"file": "arch/arm64/boot/dts/%{DTB_FILE}%", "file": "arch/arm64/boot/dts/%{DTB_FILE}%",
"store_type": "boot", "store_type": "boot",
"subdir": "dtb/rockchip" "subdir": "dtb/rockchip"
},
{
"file": "",
"store_type": "boot",
"kmods": true
} }
], ],
"makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64 INSTALL_MOD_PATH=%{out_dir}%/kmods/usr" "makeopts": "CROSS_COMPILE=%{CROSS_C}% ARCH=arm64 INSTALL_MOD_PATH=%{out_dir}%/kmods/usr"
@ -90,12 +89,12 @@
[ [
{ {
"name": "boot", "name": "boot",
"size": "1g", "size": "1G",
"first_sector": "32768" "first_sector": "32768"
}, },
{ {
"name": "rw", "name": "rw",
"size": "2g" "size": "2G"
} }
] ]
} }

10
scripts/os.py
View File

@ -155,6 +155,8 @@ class OS:
else: else:
args.insert(0, "sudo") args.insert(0, "sudo")
err_n = args[1] err_n = args[1]
else:
err_n = args
p = subprocess.Popen(args, cwd=cwd, env=env, stdout=stdout, stderr=stdout, shell=shell) p = subprocess.Popen(args, cwd=cwd, env=env, stdout=stdout, stderr=stdout, shell=shell)
p.wait() p.wait()
if (p.returncode != 0): if (p.returncode != 0):
@ -270,6 +272,7 @@ class OS:
# remove temp directory # remove temp directory
self.__tmp_clean(temp_dir) self.__tmp_clean(temp_dir)
self.__extract_tar(arch_path, temp_dir) self.__extract_tar(arch_path, temp_dir)
self.__sudo(f"rm {temp_dir}/usr/bin/qemu-{self.arch}")
sqh_fn = f"{ROOT_DIR}/out/root_{date}.sqh" sqh_fn = f"{ROOT_DIR}/out/root_{date}.sqh"
self.__make_sqh(temp_dir, sqh_fn) self.__make_sqh(temp_dir, sqh_fn)
os.symlink(sqh_fn, f"{ROOT_DIR}/out/root.sqh.tmp") os.symlink(sqh_fn, f"{ROOT_DIR}/out/root.sqh.tmp")
@ -374,9 +377,8 @@ class OS:
if (part_size > (90 * 1024 * 1024)) and (i == idx): if (part_size > (90 * 1024 * 1024)) and (i == idx):
# required partition # required partition
#print(f"\tIdx:{i} Size:{part_size}") #print(f"\tIdx:{i} Size:{part_size}")
self.__sudo(["losetup", "-o", str(offset), "--sizelimit", self.__sudo(f"losetup -o {offset} --sizelimit {part_size} /dev/loop0 {img_or_blk}",
str(part_size), "/dev/loop0", img_or_blk], cwd=ROOT_DIR, shell=True)#, stdout=subprocess.DEVNULL)
cwd=ROOT_DIR)#, stdout=subprocess.DEVNULL)
return True return True
i += 1 i += 1
offset += part_size offset += part_size
@ -425,7 +427,7 @@ class OS:
self.__copy_file(f"{self.board.out_sh}/uInitrd", f"{out_dir}/") self.__copy_file(f"{self.board.out_sh}/uInitrd", f"{out_dir}/")
Logger.install(f"\tCopy root.sqh") Logger.install(f"\tCopy root.sqh")
self.__sudo(["cp", "-H", f"{self.board.out_sh}/root.sqh", f"{out_dir}/"]) self.__sudo(["cp", "-H", f"{self.board.out_sh}/root.sqh", f"{out_dir}/"])
self.__sudo(["cp", "-H", f"{self.board.out_sh}/modules", f"{out_dir}/"]) self.__sudo(["cp", "-Hr", f"{self.board.out_sh}/modules", f"{out_dir}/"])
def __install_rw(self, out_dir): def __install_rw(self, out_dir):
self.__sudo(["touch", f"{out_dir}/rw_part"], stdout=subprocess.DEVNULL) self.__sudo(["touch", f"{out_dir}/rw_part"], stdout=subprocess.DEVNULL)