3 files changed, 2 insertions, 7 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index adcafe3..1f8e195 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -159,7 +159,7 @@ IMAGE_CMD_ostree () {
 }
 
 IMAGE_TYPEDEP_ostreepush = "ostree"
-IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
+IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot"
 IMAGE_CMD_ostreepush () {
     # Print warnings if credetials are not set or if the file has not been found.
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
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"
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""
 
-IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
-IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP"
-IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME"
-
 IMAGE_CMD_rpi-sdimg-ota () {
 
         # Align partitions
@@ -151,7 +147,7 @@ IMAGE_CMD_rpi-sdimg-ota () {
         fi
 
         # Add stamp file
-        echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
+        echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
         mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
 
         # Burn Partitions
diff --git a/classes/sota_bleeding.inc b/classes/sota_bleeding.inc
index 77d004b..fc5947d 100644
--- a/classes/sota_bleeding.inc
+++ b/classes/sota_bleeding.inc
@@ -1,2 +1 @@
 SRCREV_pn-aktualizr ?= "${AUTOREV}"
-SRCREV_pn-aktualizr-native ?= "${AUTOREV}"