Remove residual references to sysa/sysb/sysc from rootfs.py
This commit is contained in:
parent
b4d9c5e7cb
commit
c188185ad4
16
rootfs.py
16
rootfs.py
|
@ -30,7 +30,6 @@ def create_configuration_file(args):
|
||||||
with open(config_path, "w", encoding="utf_8") as config:
|
with open(config_path, "w", encoding="utf_8") as config:
|
||||||
config.write(f"FORCE_TIMESTAMPS={args.force_timestamps}\n")
|
config.write(f"FORCE_TIMESTAMPS={args.force_timestamps}\n")
|
||||||
config.write(f"CHROOT={args.chroot or args.bwrap}\n")
|
config.write(f"CHROOT={args.chroot or args.bwrap}\n")
|
||||||
config.write(f"CHROOT_ONLY_SYSA={args.bwrap}\n")
|
|
||||||
config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
|
config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
|
||||||
config.write(f"JOBS={args.cores}\n")
|
config.write(f"JOBS={args.cores}\n")
|
||||||
config.write(f"INTERNAL_CI={args.internal_ci}\n")
|
config.write(f"INTERNAL_CI={args.internal_ci}\n")
|
||||||
|
@ -100,7 +99,7 @@ def main():
|
||||||
default=4096)
|
default=4096)
|
||||||
parser.add_argument("-qs", "--target-size", help="Size of the target image (for QEMU only)",
|
parser.add_argument("-qs", "--target-size", help="Size of the target image (for QEMU only)",
|
||||||
default="16G")
|
default="16G")
|
||||||
parser.add_argument("-qk", "--kernel", help="Custom sysa kernel to use")
|
parser.add_argument("-qk", "--kernel", help="Custom early kernel to use")
|
||||||
|
|
||||||
parser.add_argument("-b", "--bare-metal", help="Build images for bare metal",
|
parser.add_argument("-b", "--bare-metal", help="Build images for bare metal",
|
||||||
action="store_true")
|
action="store_true")
|
||||||
|
@ -149,13 +148,13 @@ def main():
|
||||||
|
|
||||||
# bootstrap.cfg
|
# bootstrap.cfg
|
||||||
try:
|
try:
|
||||||
os.remove(os.path.join('sysa', 'bootstrap.cfg'))
|
os.remove(os.path.join('steps', 'bootstrap.cfg'))
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
if not args.no_create_config:
|
if not args.no_create_config:
|
||||||
create_configuration_file(args)
|
create_configuration_file(args)
|
||||||
else:
|
else:
|
||||||
with open(os.path.join('sysa', 'bootstrap.cfg'), 'a', encoding='UTF-8'):
|
with open(os.path.join('steps', 'bootstrap.cfg'), 'a', encoding='UTF-8'):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# tmpdir
|
# tmpdir
|
||||||
|
@ -173,7 +172,7 @@ def main():
|
||||||
|
|
||||||
def bootstrap(args, generator, tmpdir, size):
|
def bootstrap(args, generator, tmpdir, size):
|
||||||
"""Kick off bootstrap process."""
|
"""Kick off bootstrap process."""
|
||||||
print(f"Bootstrapping {args.arch} -- SysA")
|
print(f"Bootstrapping {args.arch}")
|
||||||
if args.chroot:
|
if args.chroot:
|
||||||
find_chroot = """
|
find_chroot = """
|
||||||
import shutil
|
import shutil
|
||||||
|
@ -211,15 +210,16 @@ print(shutil.which('chroot'))
|
||||||
init)
|
init)
|
||||||
|
|
||||||
if not args.internal_ci or args.internal_ci == "pass2" or args.internal_ci == "pass3":
|
if not args.internal_ci or args.internal_ci == "pass2" or args.internal_ci == "pass3":
|
||||||
shutil.copy2(os.path.join('sysa', 'bootstrap.cfg'),
|
os.makedirs(os.path.join(generator.tmp_dir, 'stage2', 'steps'), exist_ok=True)
|
||||||
os.path.join('tmp', 'sysa', 'sysc_image', 'usr', 'src', 'bootstrap.cfg'))
|
shutil.copy2(os.path.join('steps', 'bootstrap.cfg'),
|
||||||
|
os.path.join(generator.tmp_dir, 'stage2', 'steps', 'bootstrap.cfg'))
|
||||||
run('bwrap', '--unshare-user',
|
run('bwrap', '--unshare-user',
|
||||||
'--uid', '0',
|
'--uid', '0',
|
||||||
'--gid', '0',
|
'--gid', '0',
|
||||||
'--unshare-net' if args.external_sources else None,
|
'--unshare-net' if args.external_sources else None,
|
||||||
'--clearenv',
|
'--clearenv',
|
||||||
'--setenv', 'PATH', '/usr/bin',
|
'--setenv', 'PATH', '/usr/bin',
|
||||||
'--bind', generator.tmp_dir + "/sysc_image", '/',
|
'--bind', os.path.join(generator.tmp_dir, "stage2"), '/',
|
||||||
'--dir', '/dev',
|
'--dir', '/dev',
|
||||||
'--dev-bind', '/dev/null', '/dev/null',
|
'--dev-bind', '/dev/null', '/dev/null',
|
||||||
'--dev-bind', '/dev/zero', '/dev/zero',
|
'--dev-bind', '/dev/zero', '/dev/zero',
|
||||||
|
|
Loading…
Reference in New Issue