Skip to content

Commit 2f7c8d8

Browse files
committed
rk35xx/rockchip-rk3588: vendor u-boot: more logs for 0-byte-dtb (or not)
- so we can take a single look at CI logs and see what breaks or not and where
1 parent 08dcef6 commit 2f7c8d8

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

config/sources/families/rk35xx.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ function check_uboot_produced_binary_file__check_vendor_uboot_for_0_byte_dtb() {
6565

6666
# Run dumpimage -l, grep it for string 'Data Size: 0 Bytes', if found, exit_with_error
6767
if dumpimage -l "${binfile}" | grep -q "Data Size: 0 Bytes"; then
68-
exit_with_error "u-boot for ${BOARD}::${BRANCH}::${base_binfile}: Error: The produced u-boot.itb file contains a 0-byte DTB; built on ${HOSTRELEASE}"
68+
exit_with_error "u-boot for ${BOARD}::${BRANCH}::${base_binfile}: Error: The produced u-boot.itb file contains a 0-byte DTB; built on ${HOSTRELEASE} (${RUNNER_NAME}::${RUNNER_ENVIRONMENT}::${RUNNER_ARCH})"
69+
else
70+
display_alert "u-boot for ${BOARD}::${BRANCH}::${base_binfile}" "OK, produced u-boot.itb does NOT have 0-byte-dtb; built on ${HOSTRELEASE} (${RUNNER_NAME}::${RUNNER_ENVIRONMENT}::${RUNNER_ARCH})" "notice" # logs to CI log
6971
fi
7072

7173
return 0

config/sources/families/rockchip-rk3588.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ function check_uboot_produced_binary_file__check_vendor_uboot_for_0_byte_dtb() {
6363

6464
# Run dumpimage -l, grep it for string 'Data Size: 0 Bytes', if found, exit_with_error
6565
if dumpimage -l "${binfile}" | grep -q "Data Size: 0 Bytes"; then
66-
exit_with_error "u-boot for ${BOARD}::${BRANCH}::${base_binfile}: Error: The produced u-boot.itb file contains a 0-byte DTB; built on ${HOSTRELEASE}"
66+
exit_with_error "u-boot for ${BOARD}::${BRANCH}::${base_binfile}: Error: The produced u-boot.itb file contains a 0-byte DTB; built on ${HOSTRELEASE} (${RUNNER_NAME}::${RUNNER_ENVIRONMENT}::${RUNNER_ARCH})"
67+
else
68+
display_alert "u-boot for ${BOARD}::${BRANCH}::${base_binfile}" "OK, produced u-boot.itb does NOT have 0-byte-dtb; built on ${HOSTRELEASE} (${RUNNER_NAME}::${RUNNER_ENVIRONMENT}::${RUNNER_ARCH})" "notice" # logs to CI log
6769
fi
6870

6971
return 0

0 commit comments

Comments
 (0)