Add support for unpacking firmwares

Author: jacob-carlborg

ci.rb

@@ -32,7 +32,7 @@ def bundle
       FileUtils.mkdir_p firmware_target_directory
       bundle_uefi
       FileUtils.cp File.join("qemu", "build", qemu_name), File.join(qemu_target_dir, "qemu")
-      FileUtils.cp(firmwares.map { File.join(firmware_source_directory, _1) }, firmware_target_directory)
+      bundle_firmware
       execute "tar", "-C", architecture_directory, "-c", "-f", "#{qemu_name}-#{ci_runner.os_name}.tar", "."
     end
 
@@ -63,6 +63,17 @@ def architecture_directory
     def qemu_name
       "qemu-system-#{name}"
     end
+
+    def bundle_firmware
+      firmware_paths = firmwares.map { File.join(firmware_source_directory, _1) }
+
+      firmware_paths
+        .map { _1 + ".bz2" }
+        .filter { File.exist?(_1) }
+        .each { unpack_bzip2(_1) }
+
+      FileUtils.cp(firmware_paths, firmware_target_directory)
+    end
   end
 
   class X86_64 < Architecture
@@ -128,7 +139,7 @@ def unpack_uefi
       return unless File.exist?(archive)
 
       FileUtils.rm_f uefi_source_path
-      execute "bzip2", "-d", archive
+      unpack_bzip2 archive
     end
 
     def bundle_linaro_uefi
@@ -577,4 +588,8 @@ def download_file(url, destination)
   end
 end
 
+def unpack_bzip2(archive)
+  execute "bzip2", "-d", archive
+end
+
 CIRunner.new.run