summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <phil@advancedtelematic.com>2017-11-03 16:13:37 +0100
committerGitHub <noreply@github.com>2017-11-03 16:13:37 +0100
commit821e57d9e79f73d032b788bdace135d3959a6f42 (patch)
tree72971fb429ee7b123dee3d1938f592c537831ad7
parent9cf14ec8d924a5f88a3441ee2896a04f74188024 (diff)
parentb2b012f5c4a7f7450b96bff3fe53d0a00b41c9c8 (diff)
downloadmeta-updater-821e57d9e79f73d032b788bdace135d3959a6f42.tar.gz
Merge pull request #152 from advancedtelematic/bugfix/PRO-4012/basehash-morty
Remove IMAGEDATESTAMP to make sstate input deterministic (morty)
-rw-r--r--classes/sdcard_image-rpi-ota.bbclass6
1 files changed, 1 insertions, 5 deletions
diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass
index 81d71e9..9c859fe 100644
--- a/classes/sdcard_image-rpi-ota.bbclass
+++ b/classes/sdcard_image-rpi-ota.bbclass
@@ -73,10 +73,6 @@ SDIMG_OTA = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota"
73# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. 73# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
74FATPAYLOAD ?= "" 74FATPAYLOAD ?= ""
75 75
76IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
77IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP"
78IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME"
79
80IMAGE_CMD_rpi-sdimg-ota () { 76IMAGE_CMD_rpi-sdimg-ota () {
81 77
82 # Align partitions 78 # Align partitions
@@ -151,7 +147,7 @@ IMAGE_CMD_rpi-sdimg-ota () {
151 fi 147 fi
152 148
153 # Add stamp file 149 # Add stamp file
154 echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info 150 echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
155 mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info :: 151 mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
156 152
157 # Burn Partitions 153 # Burn Partitions