k3-vendor-image: add initramfs task deps, fix filenames

- depend on core-image-minimal-initramfs being complete
- use core-image-minimal-initramfs instead of custom initramfs image
- work on wic.gz (default in BSP) rather than .wic

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>

Author: threexc

classes/k3-vendor-image.bbclass

@@ -4,6 +4,8 @@
 # Create bootfs partition with kernel, env, Initramfs and dtbs
 # Layout matches the reference titan image (Bianbu-GNOME-K3)
 # Triggered before ext4 rootfs generation and WIC image generation
+do_image_ext4[depends] += "core-image-minimal-initramfs:do_image_complete"
+do_image_wic[depends] += "core-image-minimal-initramfs:do_image_complete"
 do_image_ext4[prefuncs] += "do_create_bootfs"
 do_image_wic[prefuncs] += "do_create_bootfs"
 
@@ -54,7 +56,7 @@ python do_create_bootfs() {
     # 3. Initramfs (rename to initrd.img-<version>)
     initrd_name = f"initrd.img-{kver_generic}"
     initramfs = next((f for f in os.listdir(deploydir)
-                      if f.startswith('initramfs-image-') and f.endswith('.cpio.gz')), None)
+                      if f.startswith('core-image-minimal-initramfs-') and f.endswith('.cpio.gz')), None)
     if initramfs:
         copy_file(initramfs, os.path.join(bootfs_dir, initrd_name))
     else:
@@ -114,35 +116,53 @@ commonargs=setenv bootargs plymouth.prefer-fbcon plymouth.ignore-serial-consoles
 do_image_wic[postfuncs] += "write_bootinfo_to_wic"
 
 python write_bootinfo_to_wic() {
-    import subprocess
-    import os
+    import subprocess, os, gzip, shutil
 
-    # 1. Retrieve Yocto path variables
     imgdeploydir = d.getVar('IMGDEPLOYDIR')
     image_name = d.getVar('IMAGE_NAME')
     deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
 
-    # K3 uses bootinfo_block.bin (from u-boot-k3)
     bootinfo_path = os.path.join(deploy_dir, 'bootinfo_block.bin')
+    wic_gz_path = os.path.join(imgdeploydir, image_name + '.wic.gz')
+    wic_bmap_path = os.path.join(imgdeploydir, image_name + '.wic.bmap')
 
-    # Define the physical path of the generated .wic file
-    wic_path = os.path.join(imgdeploydir, image_name + '.wic')
-
-    # 2. Safety checks
     if not os.path.exists(bootinfo_path):
-        bb.warn(f"[Post-WIC] bootinfo file not found: {bootinfo_path} - skipping injection")
+        bb.warn(f"[Post-WIC] bootinfo not found: {bootinfo_path} - skipping")
         return
 
-    if not os.path.exists(wic_path):
-        bb.error(f"[Post-WIC] Target WIC file not found: {wic_path}")
+    if not os.path.exists(wic_gz_path):
+        bb.error(f"[Post-WIC] WIC file not found: {wic_gz_path}")
         return
 
-    # 3. Perform the dd injection
+    tmp_wic = wic_gz_path[:-3]  # strip .gz
+
+    with gzip.open(wic_gz_path, 'rb') as f_in:
+        with open(tmp_wic, 'wb') as f_out:
+            shutil.copyfileobj(f_in, f_out)
+
     try:
-        # Write bootinfo at 1M offset (128K size) - K3 specific
-        cmd = ['dd', f'if={bootinfo_path}', f'of={wic_path}', 'bs=1K', 'seek=1024', 'count=128', 'conv=notrunc']
-        subprocess.run(cmd, check=True, capture_output=True)
-        bb.note(f"[Post-WIC] Successfully injected bootinfo (128K @ 1M) into {os.path.basename(wic_path)}")
+        subprocess.run(
+            ['dd', f'if={bootinfo_path}', f'of={tmp_wic}',
+             'bs=1K', 'seek=1024', 'count=128', 'conv=notrunc'],
+            check=True, capture_output=True)
+        bb.note(f"[Post-WIC] Injected bootinfo (128K @ 1M)")
     except subprocess.CalledProcessError as e:
-        bb.error(f"[Post-WIC] dd command failed: {e.stderr.decode()}")
+        os.unlink(tmp_wic)
+        bb.error(f"[Post-WIC] dd failed: {e.stderr.decode()}")
+        return
+
+    with open(tmp_wic, 'rb') as f_in:
+        with gzip.open(wic_gz_path, 'wb', compresslevel=9) as f_out:
+            shutil.copyfileobj(f_in, f_out)
+
+    if os.path.exists(wic_bmap_path):
+        try:
+            subprocess.run(
+                ['bmaptool', 'create', tmp_wic, '-o', wic_bmap_path],
+                check=True, capture_output=True)
+            bb.note(f"[Post-WIC] Regenerated bmap")
+        except subprocess.CalledProcessError as e:
+            bb.warn(f"[Post-WIC] bmaptool failed: {e.stderr.decode()}")
+
+    os.unlink(tmp_wic)
 }