refactor(debos): Patch partitions.conf instead of .xml

This will make it easier to add contents.xml support.

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

Author: lool

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

@@ -162,14 +162,52 @@ actions:
       (
           cd build/{{ $board.platform }}_ptool
           conf="${QCOM_PTOOL}/platforms/{{ $board.platform }}/partitions.conf"
-          "${QCOM_PTOOL}/gen_partition.py" -i "$conf" \
+          disk_type="unknown"
+          # make a copy of partitions.conf with patched/added names for
+          # ESP (name=efi, filename=efi.bin), rootfs (name=rootfs,
+          # filename=rootfs.img), DTB (name=dtb_a or name=dtb_b,
+          # filename=dtb.bin), and CDT (name=cdt, no or special
+          # filenames)
+          while read line; do
+              case "$line" in
+                "--disk "*)
+                  disk_type="$(echo "$line" | sed -n 's/.*--type=\([^ ]*\).*/\1/p')"
+                  case $disk_type in
+                    "emmc")
+                      touch flash-emmc
+                      esp="../disk-sdcard.img1"
+                      rootfs="../disk-sdcard.img2"
+                      ;;
+                    "ufs")
+                      touch flash-ufs
+                      esp="../disk-ufs.img1"
+                      rootfs="../disk-ufs.img2"
+                      ;;
+                  esac
+                  ;;
+                "--partition "*)
+                  name="$(echo "$line" | sed -n 's/.*--name=\([^ ]*\).*/\1/p')"
+                  filename=""
+                  case "$name" in
+                    dtb_a|dtb_b) filename="dtb.bin";;
+                    efi) filename="$esp";;
+                    rootfs) filename="$rootfs";;
+                    {{- if $board.cdt_download }}
+                    cdt) filename={{ $board.cdt_filename }};;
+                    {{- end }}
+                  esac
+                  if [ -n "$filename" ]; then
+                      line="$(echo "$line" | sed 's/ --filename=[^ ]*//')"
+                      line="${line} --filename=${filename}"
+                  fi
+                  ;;
+              esac
+              echo "$line"
+          done <"$conf" >partitions.conf
+          # generate ptool-partitions.xml from partitions.conf
+          "${QCOM_PTOOL}/gen_partition.py" -i partitions.conf \
               -o ptool-partitions.xml
-          # partitions.conf sets --type=emmc, nand or ufs
-          if grep -F '^--disk --type=ufs ' "${conf}"; then
-              touch flash-ufs
-          elif grep -F '^--disk --type=emmc ' "${conf}"; then
-              touch flash-emmc
-          fi
+          # generate flashing files from qcom-partitions.xml
           "${QCOM_PTOOL}/ptool.py" -x ptool-partitions.xml
       )
 
@@ -219,10 +257,6 @@ actions:
       # copy just the CDT data; no partition or flashing files
       cp --preserve=mode,timestamps -v build/{{ $board.name }}_cdt/{{ $board.cdt_filename }} \
           "${flash_dir}"
-
-      # update flashing files for CDT
-      sed -i '/label="cdt"/s/filename=""/filename="{{ $board.cdt_filename }}"/' \
-          "${flash_dir}"/rawprogram*.xml
       {{- end }}
 
       {{- if $board.dtb }}
@@ -242,21 +276,7 @@ actions:
       tar -C build -xvf "${ARTIFACTDIR}/dtbs.tar.gz" "{{ $board.dtb }}"
       # copy into the FAT as combined-dtb.dtb
       mcopy -vmp -i "${dtb_bin}" "build/{{ $board.dtb }}" ::/combined-dtb.dtb
-      # (NB: flashing files already expect "dtb.bin" as a filename)
       {{- end }}
-
-      # update flashing files for ESP image;
-      # qcom-ptool/platforms/*/partitions.conf uses filename=efi.bin for the
-      # ESP partition on EFI capable platforms
-      sed -i '/label="efi"/s#filename="[^"]*"#filename="../disk-{{ $board.disk_image_type }}.img1"#' \
-          "${flash_dir}"/rawprogram*.xml
-
-      # update flashing files for rootfs image;
-      # qcom-ptool/platforms/*/partitions.conf uses filename=rootfs.img for the
-      # rootfs partition
-      sed -i \
-          '/label="rootfs"/s#filename="[^"]*"#filename="../disk-{{ $board.disk_image_type }}.img2"#' \
-          "${flash_dir}"/rawprogram*.xml
 {{- end }}
 
       # cleanup