summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-10-25 15:08:29 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-10-26 12:57:33 +0000
commit88c0a44cc421f5cb614dd068c94984fd6cce6520 (patch)
tree3ca7a9c05c2b37a4ceba66d4b8c5de02b2659f64 /meta-boot2qt
parent2b21f641158e70ba0b77482ef11eb0ad8ea01bc6 (diff)
downloadmeta-boot2qt-88c0a44cc421f5cb614dd068c94984fd6cce6520.tar.gz
toradex: fix problem with basehash in tezi
The tezi image uses DATE value but does not exclude it from basehash calculation, which leads to build error: "basehash value changed from ... to .... The metadata is not deterministic and this needs to be fixed." Re-apply the fix as it's still not correctly fixed in toradex layers. Change-Id: I0e835db98e812c4af23e01215b045ba1a7298753 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt')
-rw-r--r--meta-boot2qt/classes/image_types_sdcard.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-boot2qt/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 4ec38e5..a894bca 100644
--- a/meta-boot2qt/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
@@ -84,6 +84,9 @@ END
84 ln -sf ${IMAGE_NAME}.flasher.tar.gz ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.flasher.tar.gz 84 ln -sf ${IMAGE_NAME}.flasher.tar.gz ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.flasher.tar.gz
85} 85}
86 86
87# fix: basehash value changed from ... to ....
88# The metadata is not deterministic and this needs to be fixed.
89do_image_teziimg[vardepsexclude] += "DATETIME DATE TIME"
87do_image_teziimg[depends] += "qtbase-native:do_populate_sysroot" 90do_image_teziimg[depends] += "qtbase-native:do_populate_sysroot"
88IMAGE_CMD_teziimg_append() { 91IMAGE_CMD_teziimg_append() {
89 ${IMAGE_CMD_TAR} --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -rhf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar TEZI_B2QT_EULA.TXT Built_with_Qt.png 92 ${IMAGE_CMD_TAR} --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -rhf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar TEZI_B2QT_EULA.TXT Built_with_Qt.png