Skip to content

Commit

Permalink
Merge pull request #96 from matttbe/config
Browse files Browse the repository at this point in the history
vng: override kconfig with '--force'
  • Loading branch information
arighi committed Mar 20, 2024
2 parents 739793a + 7854354 commit f7bb8cc
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions virtme_ng/run.py
Expand Up @@ -157,7 +157,7 @@ def make_parser():
"--kconfig",
"-k",
action="store_true",
help="Only generate the kernel .config without building/running anything",
help="Only override the kernel .config without building/running anything",
)

parser.add_argument(
Expand Down Expand Up @@ -408,7 +408,8 @@ def make_parser():
"--force",
action="store_true",
help="Force reset git repository to target branch or commit "
"(warning: this may drop uncommitted changes)",
"(warning: this may drop uncommitted changes), "
"and force kernel config override",
)

parser.add_argument(
Expand Down Expand Up @@ -565,7 +566,9 @@ def checkout(self, args):
def config(self, args):
"""Perform a make config operation on a kernel source directory."""
arch = args.arch
cmd = "virtme-configkernel --defconfig --no-update"
cmd = "virtme-configkernel --defconfig"
if not args.force and not args.kconfig:
cmd += " --no-update"
if arch is not None:
if arch not in ARCH_MAPPING:
arg_fail(f"unsupported architecture: {arch}")
Expand Down

0 comments on commit f7bb8cc

Please sign in to comment.