asahi_firmware: Clean up FWPackage path handling

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

asahi_firmware/core.py

@@ -21,19 +21,22 @@ def __hash__(self):
         return hash(self.sha)
 
 class FWPackage(object):
-    def __init__(self, tar_path, cpio_path):
+    def __init__(self, path):
         self.closed = False
-        self.tar_path = tar_path
-        self.cpio_path = cpio_path
-        self.tarfile = tarfile.open(tar_path, mode="w")
-        self.cpiofile = cpio.CPIO(cpio_path)
+        self.path = path
+        self.tar_path = os.path.join(path, "firmware.tar")
+        self.cpio_path = os.path.join(path, "firmware.cpio")
+        self.tarfile = tarfile.open(self.tar_path, mode="w")
+        self.cpiofile = cpio.CPIO(self.cpio_path)
         self.hashes = {}
         self.manifest = []
 
     def close(self):
         if self.closed:
             return
 
+        self.closed = True
+
         ti = tarfile.TarInfo("vendorfw/.vendorfw.manifest")
         ti.type = tarfile.REGTYPE
         fd = io.BytesIO()
@@ -45,7 +48,10 @@ def close(self):
 
         self.tarfile.close()
         self.cpiofile.close()
-        self.closed = True
+
+        with open(os.path.join(self.path, "manifest.txt"), "w") as fd:
+            for i in self.manifest:
+                fd.write(i + "\n")
 
     def add_file(self, name, data):
         ti = tarfile.TarInfo(name)
@@ -74,10 +80,5 @@ def add_files(self, it):
         for name, data in it:
             self.add_file(name, data)
 
-    def save_manifest(self, filename):
-        with open(filename, "w") as fd:
-            for i in self.manifest:
-                fd.write(i + "\n")
-
     def __del__(self):
         self.close()

asahi_firmware/update.py

@@ -12,8 +12,7 @@ def update_firmware(source, dest):
     if not raw_fw.exists():
         print(f"Could not find {raw_fw}")
 
-    pkg = FWPackage(os.path.join(dest, "firmware.tar"),
-                    os.path.join(dest, "firmware.cpio"))
+    pkg = FWPackage(dest)
 
     with tempfile.TemporaryDirectory() as tmpdir:
         tmpdir = pathlib.Path(tmpdir)
@@ -33,8 +32,6 @@ def update_firmware(source, dest):
 
     pkg.close()
 
-    pkg.save_manifest(os.path.join(dest, "manifest.txt"))
-
 def main():
     import argparse
     import logging

src/main.py

@@ -431,7 +431,8 @@ def do_install(self, total_size=None):
 
         pkg = None
         if self.osins.needs_firmware:
-            pkg = asahi_firmware.core.FWPackage("firmware.tar", "firmware.cpio")
+            os.path.makedirs("vendorfw", exist_ok=True)
+            pkg = asahi_firmware.core.FWPackage("vendorfw")
             self.ins.collect_firmware(pkg)
             pkg.close()
             self.osins.firmware_package = pkg

src/osinstall.py

@@ -126,10 +126,7 @@ def install(self, stub_ins):
                 p_plain(f"  Copying firmware into {info.name} partition...")
                 base = os.path.join(mountpoint, "vendorfw")
                 logging.info(f"Firmware -> {base}")
-                os.makedirs(base, exist_ok=True)
-                shutil.copy(self.firmware_package.tar_path, os.path.join(base, "firmware.tar"))
-                shutil.copy(self.firmware_package.cpio_path, os.path.join(base, "firmware.cpio"))
-                self.firmware_package.save_manifest(os.path.join(base, "manifest.txt"))
+                shutil.copytree(self.firmware_package.path, base)
             if part.get("copy_installer_data", False):
                 mountpoint = self.dutil.mount(info.name)
                 data_path = os.path.join(mountpoint, "asahi")