kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(extra-builds): remove build_guix_also flag and legacy compatibility paths

Browse source
This commit is contained in:
vxtls 2026-03-15 14:04:39 -04:00
parent 4dc0135455
commit 8917b7ba3d
7 changed files with 33 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rootfs.py
View file

@ -314,8 +314,7 @@ def _update_stage0_tree(mountpoint,
with open(old_config_path, "r", encoding="utf-8") as cfg:
lines = [
line for line in cfg
if not line.startswith("BUILD_GUIX_ALSO=")
and not line.startswith("EXTRA_BUILDS=")
if not line.startswith("EXTRA_BUILDS=")
and not line.startswith("INTERNAL_CI=")
and not line.startswith(_RESUME_NEXT_SCOPE_VAR + "=")
and not line.startswith(_RESUME_NEXT_PACKAGE_VAR + "=")
@ -613,9 +612,6 @@ def main():
parser.add_argument("--extra-builds",
help="Comma-separated extra build namespaces to run after main steps "
"(e.g. guix or guix,gentoo,azl3).")
parser.add_argument("--build-guix-also",
help=argparse.SUPPRESS,
action="store_true")
parser.add_argument("--no-create-config",
help="Do not automatically create config file",
action="store_true")
@ -658,8 +654,6 @@ def main():
args = parser.parse_args()
args.extra_builds = parse_extra_builds(args.extra_builds)
if args.build_guix_also and "guix" not in args.extra_builds:
args.extra_builds.append("guix")
# Mode validation
def check_types():
@ -786,7 +780,7 @@ def main():
repo_path=args.repo,
early_preseed=args.early_preseed,
mirrors=args.mirrors,
build_guix_also=("guix" in args.extra_builds))
extra_builds=args.extra_builds)
bootstrap(args, generator, target, args.target_size, cleanup)
cleanup()