Skip to content

Commit 303d8cd

Browse files
committed
fix: Add build_id element to contents.xml
This should be a gen_contents.py flag, but in the meantime, fix the contents.xml files to allow Axiom testing. Signed-off-by: Loïc Minier <[email protected]>
1 parent 22a4260 commit 303d8cd

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.github/workflows/debos.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ jobs:
117117
- name: Build flashable files with debos
118118
run: |
119119
set -ux
120-
debos -t u_boot_rb1:rb1-boot.img \
120+
debos \
121+
-t u_boot_rb1:rb1-boot.img \
122+
-t "buildid:${BUILD_ID}" \
121123
--print-recipe \
122124
debos-recipes/qualcomm-linux-debian-flash.yaml
123125

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
{{- if .u_boot_rb1 -}}
77
{{- $build_rb1 = "true" }}
88
{{- end -}}
9+
{{- $buildid := or .buildid "" }}
910

1011
architecture: arm64
1112

@@ -251,6 +252,13 @@ actions:
251252
"${QCOM_PTOOL}/gen_contents.py" -p ptool-partitions.xml \
252253
-t "$contents" \
253254
-o contents.xml
255+
# XXX insert build_id element before windows_root_path;
256+
# this will be nicer to do when gen_contents.py supports
257+
# setting this; see also:
258+
# https://github.com/qualcomm-linux/qcom-ptool/pull/38
259+
sed -i \
260+
"/windows_root_path/ i \t\t\t\t<build_id>{{$buildid}}</build_id>" \
261+
contents.xml
254262
fi
255263
# generate flashing files from qcom-partitions.xml
256264
"${QCOM_PTOOL}/ptool.py" -x ptool-partitions.xml

0 commit comments

Comments
 (0)