Skip to content

Commit 15f57c1

Browse files
aero.py: use run_command to run xbstrap
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent 99faa41 commit 15f57c1

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

aero.py

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -330,27 +330,7 @@ def build_userland_sysroot(args):
330330
# symlink the bootstrap.yml file in the src root to sysroot/bootstrap.link
331331
symlink_rel('bootstrap.yml', blink)
332332

333-
os.chdir(SYSROOT_DIR)
334-
335-
args = {
336-
"update": True,
337-
"all": True,
338-
"dry_run": False,
339-
"check": False,
340-
"recursive": False,
341-
"paranoid": False,
342-
"reset": False,
343-
"hard_reset": False,
344-
"only_wanted": False,
345-
"keep_going": False,
346-
347-
"progress_file": None, # file that receives machine-ready progress notifications
348-
"reconfigure": False,
349-
"rebuild": False
350-
}
351-
352-
namespace = argparse.Namespace(**args)
353-
xbstrap.do_install(namespace)
333+
run_command(['xbstrap', 'install', '-u', '--all'], cwd=SYSROOT_DIR)
354334

355335

356336
def build_userland(args):
@@ -496,7 +476,7 @@ def run_in_emulator(build_info: BuildInfo, iso_path):
496476
'-m', args.memory,
497477
'-smp', '1',
498478
'-serial', 'stdio',
499-
'-drive', 'file=build/disk.img,if=none,id=NVME1', '-device', 'nvme,drive=NVME1,serial=nvme',
479+
'-drive', 'file=build/disk.img,if=none,id=NVME1,format=raw', '-device', 'nvme,drive=NVME1,serial=nvme',
500480
# Specify the boot order (where `d` is the first CD-ROM drive)
501481
'--boot', 'd']
502482

0 commit comments

Comments
 (0)