Merge pull request #95 from vmezzela/setup-next

Convert setup to plugins

Author: fgyanz

klpbuild/klplib/cmd.py

@@ -14,6 +14,7 @@ def add_arg_lp_name(parentparser, mandatory=True):
         "--name",
         type=str,
         required=mandatory,
+        dest="lp_name",
         help="The livepatch name. This will be the directory name of the "
         "resulting livepatches.",
     )
@@ -44,57 +45,6 @@ def create_parser() -> argparse.ArgumentParser:
 
     # NOTE: all the code below should be gone when all the module will be
     # converted into plugins
-    setup = sub.add_parser("setup")
-    add_arg_lp_name(setup)
-    add_arg_lp_filter(setup)
-    setup.add_argument("--cve", type=str, help="SLE specific. The CVE assigned to this livepatch")
-    setup.add_argument("--conf", type=str, required=True, help="The kernel CONFIG used to be build the livepatch")
-    setup.add_argument(
-        "--no-check",
-        action="store_true",
-        help="SLE specific. Do not check for already patched codestreams, do the setup for all non filtered codestreams.",
-    )
-    setup.add_argument(
-        "--file-funcs",
-        required=False,
-        action="append",
-        nargs="*",
-        default=[],
-        help="File and functions to be livepatched. Can be set "
-        "multiple times. The format is --file-funcs file/path.c func1 "
-        "func2 --file-func file/patch2 func1...",
-    )
-    setup.add_argument(
-        "--mod-file-funcs",
-        required=False,
-        action="append",
-        nargs="*",
-        default=[],
-        help="Module, file and functions to be livepatched. Can be set "
-        "multiple times. The format is --file-funcs module1 file/path.c func1 "
-        "func2 --file-func module2 file/patch2 func1...",
-    )
-    setup.add_argument(
-        "--conf-mod-file-funcs",
-        required=False,
-        action="append",
-        nargs="*",
-        default=[],
-        help="Conf, module, file and functions to be livepatched. Can be set "
-        "multiple times. The format is --file-funcs conf1 module1 file/path.c func1 "
-        "func2 --file-func conf2 module2 file/patch2 func1...",
-    )
-    setup.add_argument(
-        "--module", type=str, default="vmlinux", help="The module that will be livepatched for all files"
-    )
-    setup.add_argument(
-        "--archs",
-        default=ARCHS,
-        choices=ARCHS,
-        nargs="+",
-        help="SLE specific. Supported architectures for this livepatch",
-    )
-
     check_inline = sub.add_parser("check-inline")
     add_arg_lp_name(check_inline)
     add_arg_lp_filter(check_inline)

klpbuild/main.py

@@ -14,7 +14,6 @@
 from klpbuild.klplib.plugins import try_run_plugin
 from klpbuild.plugins.extractor import Extractor
 from klpbuild.plugins.inline import Inliner
-from klpbuild.plugins.setup import Setup
 
 
 def main():
@@ -23,8 +22,8 @@ def main():
     logging_level = logging.DEBUG if args.verbose else logging.INFO
     logging.basicConfig(level=logging_level, format="%(message)s")
 
-    if hasattr(args, 'name'):
-        load_codestreams(args.name)
+    if hasattr(args, 'lp_name'):
+        load_codestreams(args.lp_name)
 
     try:
         try_run_plugin(args.cmd, args)
@@ -39,44 +38,35 @@ def main():
 
     # NOTE: all the code below should be gone when all the modules will be
     # converted into plugins
-    if args.cmd == "setup":
-        setup = Setup(args.name)
-        ffuncs = Setup.setup_file_funcs(args.conf, args.module, args.file_funcs,
-                                        args.mod_file_funcs, args.conf_mod_file_funcs)
-        codestreams = setup.setup_codestreams(
-            {"cve": args.cve, "conf": args.conf, "lp_filter": args.lp_filter,
-                "no_check": args.no_check})
-        setup.setup_project_files(codestreams, ffuncs, args.archs)
-
-    elif args.cmd == "extract":
-        Extractor(args.name, args.lp_filter, args.apply_patches, args.avoid_ext).run()
+    if args.cmd == "extract":
+        Extractor(args.lp_name, args.lp_filter, args.apply_patches, args.avoid_ext).run()
 
     elif args.cmd == "cs-diff":
-        Extractor(args.name, args.lp_filter, False, []).cs_diff()
+        Extractor(args.lp_name, args.lp_filter, False, []).cs_diff()
 
     elif args.cmd == "check-inline":
-        Inliner(args.name, args.codestream).check_inline(args.file, args.symbol)
+        Inliner(args.lp_name, args.codestream).check_inline(args.file, args.symbol)
 
     elif args.cmd == "get-patches":
-        GitHelper(args.lp_filter).get_commits(args.cve, get_workdir(args.name))
+        GitHelper(args.lp_filter).get_commits(args.cve, get_workdir(args.lp_name))
 
     elif args.cmd == "format-patches":
-        GitHelper(args.lp_filter).format_patches(args.name, args.version)
+        GitHelper(args.lp_filter).format_patches(args.lp_name, args.version)
 
     elif args.cmd == "status":
-        IBS(args.name, args.lp_filter).status(args.wait)
+        IBS(args.lp_name, args.lp_filter).status(args.wait)
 
     elif args.cmd == "push":
-        IBS(args.name, args.lp_filter).push(args.wait)
+        IBS(args.lp_name, args.lp_filter).push(args.wait)
 
     elif args.cmd == "log":
-        IBS(args.name, args.lp_filter).log(args.arch)
+        IBS(args.lp_name, args.lp_filter).log(args.arch)
 
     elif args.cmd == "cleanup":
-        IBS(args.name, args.lp_filter).cleanup()
+        IBS(args.lp_name, args.lp_filter).cleanup()
 
     elif args.cmd == "prepare-tests":
-        IBS(args.name, args.lp_filter).prepare_tests()
+        IBS(args.lp_name, args.lp_filter).prepare_tests()
 
 
 if __name__ == "__main__":