Merge pull request #93 from marcosps/module-path-resolving

Module path resolving

Author: fgyanz

klpbuild/klplib/codestream.py

@@ -268,8 +268,6 @@ def validate_config(self, conf, mod):
             print(configs["m"])
             raise RuntimeError(f"{self.name()}: Configuration mismatach between codestreams. Aborting.")
 
-
-    # Return only the name of the module to be livepatched
     def find_obj_path(self, arch, mod):
         # Return the path if the modules was previously found for ARCH, or refetch if
         # the obejct is for a different architecture
@@ -291,15 +289,12 @@ def find_obj_path(self, arch, mod):
             if not obj_match:
                 raise RuntimeError(f"{self.name()}-{arch} ({self.kernel}): Module not found: {mod}")
 
-        # modules.order will show the module with suffix .o, so
-        # make sure the extension. Also check for multiple extensions since we
-        # can have modules being compressed using different algorithms.
-        for ext in [".ko", ".ko.zst", ".ko.gz"]:
-            obj = str(PurePath(obj_match.group(1)).with_suffix(ext))
-            if Path(mod_path, obj).exists():
-                break
+        # modules.order will show the module with suffix .o, so make sure the extension.
+        obj_path = mod_path/(PurePath(obj_match.group(1)).with_suffix(".ko"))
+        # Make sure that the .ko file exists
+        assert obj_path.exists(), f"Module {str(obj_path)} doesn't exists. Aborting"
 
-        return Path(mod_path, obj).relative_to(get_datadir(arch))
+        return obj_path.relative_to(get_datadir(arch))
 
 
     def lp_out_file(self, lp_name, fname):

klpbuild/klplib/ibs.py

@@ -205,7 +205,7 @@ def download_cs_data(self, cs_list):
 
         rpms = self.get_cs_packages(cs_list, dest)
 
-        logging.info(f"Downloading {len(rpms)} rpms...")
+        logging.info("Downloading %s rpms...", len(rpms))
         self.total = len(rpms)
         self.do_work(self.download_and_extract, rpms)
 
@@ -215,7 +215,7 @@ def download_cs_data(self, cs_list):
             for arch in cs.archs:
                 # Extract modules and vmlinux files that are compressed
                 mod_path = cs.get_mod_path(arch)
-                for fext, ecmd in [("zst", "unzstd -f -d"), ("xz", "xz --quiet -d -k")]:
+                for fext, ecmd in [("zst", "unzstd --rm -f -d"), ("xz", "xz --quiet -d -k")]:
                     cmd = rf'find {mod_path} -name "*.{fext}" -exec {ecmd} --quiet {{}} \;'
                     subprocess.check_output(cmd, shell=True)