pmbootstrap init: (build => additional) options (MR 1931)
Rename "build options" to "additional options", so we can put non-build related options there too.
This commit is contained in:
parent
0ff9c5d471
commit
d623913491
|
@ -334,9 +334,9 @@ def ask_for_device(args):
|
||||||
return (device, device_exists, kernel, nonfree)
|
return (device, device_exists, kernel, nonfree)
|
||||||
|
|
||||||
|
|
||||||
def ask_for_build_options(args, cfg):
|
def ask_for_additional_options(args, cfg):
|
||||||
# Allow to skip build options
|
# Allow to skip additional options
|
||||||
logging.info("Build options: Parallel jobs: " + args.jobs +
|
logging.info("Additional options: Parallel jobs: " + args.jobs +
|
||||||
", ccache per arch: " + args.ccache_size)
|
", ccache per arch: " + args.ccache_size)
|
||||||
|
|
||||||
if not pmb.helpers.cli.confirm(args, "Change them?",
|
if not pmb.helpers.cli.confirm(args, "Change them?",
|
||||||
|
@ -423,7 +423,7 @@ def frontend(args):
|
||||||
ui = ask_for_ui(args, device)
|
ui = ask_for_ui(args, device)
|
||||||
cfg["pmbootstrap"]["ui"] = ui
|
cfg["pmbootstrap"]["ui"] = ui
|
||||||
cfg["pmbootstrap"]["ui_extras"] = str(ask_for_ui_extras(args, ui))
|
cfg["pmbootstrap"]["ui_extras"] = str(ask_for_ui_extras(args, ui))
|
||||||
ask_for_build_options(args, cfg)
|
ask_for_additional_options(args, cfg)
|
||||||
|
|
||||||
# Extra packages to be installed to rootfs
|
# Extra packages to be installed to rootfs
|
||||||
logging.info("Additional packages that will be installed to rootfs."
|
logging.info("Additional packages that will be installed to rootfs."
|
||||||
|
|
|
@ -250,8 +250,8 @@ def test_questions_work_path(args, monkeypatch, tmpdir):
|
||||||
assert func(args) == (work, False)
|
assert func(args) == (work, False)
|
||||||
|
|
||||||
|
|
||||||
def test_questions_build_options(args, monkeypatch):
|
def test_questions_additional_options(args, monkeypatch):
|
||||||
func = pmb.config.init.ask_for_build_options
|
func = pmb.config.init.ask_for_additional_options
|
||||||
cfg = {"pmbootstrap": {}}
|
cfg = {"pmbootstrap": {}}
|
||||||
|
|
||||||
# Skip changing anything
|
# Skip changing anything
|
||||||
|
|
Loading…
Reference in New Issue