2 files changed, 18 insertions, 72 deletions

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 9d596be3a7..b9e60cbe4e 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -345,64 +345,29 @@ class Disk:
                                                    path))
 
     def copy(self, src, dest):
-        """Copy files or directories to/from the vfat or ext* partition."""
-        pnum = dest.part if isinstance(src, str) else src.part
-        partimg = self._get_part_image(pnum)
+        """Copy partition image into wic image."""
+        pnum =  dest.part if isinstance(src, str) else src.part
 
         if self.partitions[pnum].fstype.startswith('ext'):
-            if isinstance(src, str): # host to image case
-                if os.path.isdir(src):
-                    base = os.path.abspath(src)
-                    base_parent = os.path.dirname(base)
-                    cmds = []
-                    made = set()
-
-                    for root, dirs, files in os.walk(base):
-                        for fname in files:
-                            host_file = os.path.join(root, fname)
-                            rel = os.path.relpath(host_file, base_parent)
-                            dest_file = os.path.join(dest.path, rel)
-                            dest_dir = os.path.dirname(dest_file)
-
-                            # create dir structure (mkdir -p)
-                            parts = dest_dir.strip('/').split('/')
-                            cur = ''
-                            for p in parts:
-                                cur = cur + '/' + p
-                                if cur not in made:
-                                    cmds.append(f'mkdir "{cur}"')
-                                    made.add(cur)
-
-                            cmds.append(f'write "{host_file}" "{dest_file}"')
-
-                    # write script to a temp file
-                    with tempfile.NamedTemporaryFile(mode='w', delete=False,
-                                                     prefix='wic-debugfs-') as tf:
-                        for line in cmds:
-                            tf.write(line + '\n')
-                        scriptname = tf.name
-
-                    cmd = f"{self.debugfs} -w -f {scriptname} {partimg}"
-
-                else: # single file
-                    cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
-                          format(os.path.dirname(dest.path), src,
-                                 os.path.basename(src), self.debugfs, partimg)
-
-            else: # image to host case
+            if isinstance(src, str):
+                cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
+                      format(os.path.dirname(dest.path), src, os.path.basename(src),
+                             self.debugfs, self._get_part_image(pnum))
+            else: # copy from wic
+                # run both dump and rdump to support both files and directory
                 cmd = "printf 'cd {}\ndump /{} {}\nrdump /{} {}\n' | {} {}".\
                       format(os.path.dirname(src.path), src.path,
-                             dest, src.path, dest, self.debugfs, partimg)
-
+                             dest, src.path, dest, self.debugfs,
+                             self._get_part_image(pnum))
         else: # fat
             if isinstance(src, str):
                 cmd = "{} -i {} -snop {} ::{}".format(self.mcopy,
-                                                      partimg,
-                                                      src, dest.path)
+                                                  self._get_part_image(pnum),
+                                                  src, dest.path)
             else:
                 cmd = "{} -i {} -snop ::{} {}".format(self.mcopy,
-                                                      partimg,
-                                                      src.path, dest)
+                                                  self._get_part_image(pnum),
+                                                  src.path, dest)
 
         exec_cmd(cmd, as_shell=True)
         self._put_part_image(pnum)
diff --git a/scripts/runqemu b/scripts/runqemu
index 4bac151ccf..c28980e616 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -421,27 +421,8 @@ class BaseConfig(object):
         else:
             raise RunQemuError("Unknown path arg %s" % p)
 
-    def rootfs_fixups(self):
-
-        """Decompress and/or resize the rootfs image, if needed"""
-        qb_rootfs_opt = self.get('QB_ROOTFS_OPT')
-
-        # Check if sdcard size is a power of 2, as that is currently a requirement for qemu
-        # See https://gitlab.com/qemu-project/qemu/-/issues/1754
-        rootfs_size = os.path.getsize(self.rootfs)
-        rootfs_size_pwr2 = 1 << (rootfs_size - 1).bit_length()
-        if ("if=sd" in qb_rootfs_opt or "if=pflash" in qb_rootfs_opt) and rootfs_size != rootfs_size_pwr2:
-            logger.info("Using sd-card or pflash and is not power of 2. File size %d, power of 2 size %d" %(rootfs_size, rootfs_size_pwr2))
-            logger.info("Attempting to use truncate to correct this.")
-
-            # Ensure the 'truncate' tool is installed before attempting to make a power of 2.
-            if not shutil.which('truncate'):
-                raise RunQemuError(f"'truncate' is required to make {self.rootfs} a power of 2 in size but was not found in PATH")
-            try:
-                subprocess.check_call(['truncate', '-s', str(rootfs_size_pwr2), self.rootfs])
-            except subprocess.CalledProcessError as e:
-                raise RunQemuError(f"Failed to make {self.rootfs} power of 2 in size: {e}")
-
+    def uncompress_rootfs(self):
+        """Decompress ZST rootfs image if needed"""
         if not self.rootfs or not self.fstype.endswith('.zst'):
             return
         
@@ -903,7 +884,7 @@ to your build configuration.
         self.set('QB_MEM', qb_mem)
 
         mach = self.get('MACHINE')
-        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')) and self.get('QB_DTB') == "":
+        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')):
             self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M'
 
         self.qemu_opt_script += ' %s' % self.get('QB_MEM')
@@ -1828,7 +1809,7 @@ def main():
         config.check_args()
         config.read_qemuboot()
         config.check_and_set()
-        config.rootfs_fixups()
+        config.uncompress_rootfs()
         # Check whether the combos is valid or not
         config.validate_combos()
         config.print_config()