fix: debos: Only strip top directories from zips

Instead of using `unzip -j` which will ignore the directory structure
inside zip archives, manually move files out of the toplevel
directories. This avoids errors if the same filename is used multiple
times, for instance prog_firehose_ddr.elf might be present multiple
times in some boot binaries zip archives (e.g. for the sail/
subdirectory).

Signed-off-by: Loïc Minier <[email protected]>

Author: lool

debos-recipes/qualcomm-linux-debian-flash.yaml

@@ -100,8 +100,12 @@ actions:
       ### silicon family: {{ $board.silicon_family }}
 
       # unpack boot binaries
-      unzip -j "${ROOTDIR}/../{{ $board.boot_binaries_download.filename }}" \
-          -d build/{{ $board.name }}_boot-binaries
+      mkdir -v build/{{ $board.name }}_boot-binaries
+      unzip "${ROOTDIR}/../{{ $board.boot_binaries_download.filename }}" \
+          -d build/{{ $board.name }}_boot-binaries/unpack
+      # strip top directories
+      mv build/{{ $board.name }}_boot-binaries/unpack/*/* build/{{ $board.name }}_boot-binaries
+      rmdir -v build/{{ $board.name }}_boot-binaries/unpack/* build/{{ $board.name }}_boot-binaries/unpack
 
       # generate partition files
       mkdir -v build/{{ $board.platform }}_partitions
@@ -160,7 +164,7 @@ actions:
 
       {{- if $board.cdt_download }}
       # unpack board CDT
-      unzip -j "${ROOTDIR}/../{{ $board.cdt_download.filename }}" \
+      unzip "${ROOTDIR}/../{{ $board.cdt_download.filename }}" \
           -d build/{{ $board.name }}_cdt
       # copy just the CDT data; no partition or flashing files
       cp --preserve=mode,timestamps -v build/{{ $board.name }}_cdt/{{ $board.cdt_filename }} \