diff options
author | cajun-rat <phil@advancedtelematic.com> | 2017-11-01 13:40:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-01 13:40:40 +0100 |
commit | d3d3247fb1e15b5595b7b38a441501f1bcf23449 (patch) | |
tree | 18a79f3c0ffa64e9eac8aa4530a5c904f293c8fc | |
parent | 4ec946c62543dd597310ec47005e3ed6229daf5f (diff) | |
parent | 45668eb879d79d9719ab82cbcdd4bbe2d6604c8e (diff) | |
download | meta-updater-d3d3247fb1e15b5595b7b38a441501f1bcf23449.tar.gz |
Merge pull request #151 from advancedtelematic/bugfix/PRO-4012/basehash
Remove IMAGEDATESTAMP to make sstate input deterministic
-rw-r--r-- | classes/sdcard_image-rpi-ota.bbclass | 6 |
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. |
74 | FATPAYLOAD ?= "" | 74 | FATPAYLOAD ?= "" |
75 | 75 | ||
76 | IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" | ||
77 | IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP" | ||
78 | IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME" | ||
79 | |||
80 | IMAGE_CMD_rpi-sdimg-ota () { | 76 | IMAGE_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 |