summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2018-09-14 17:46:42 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2018-09-14 17:58:31 +0200
commit2592e78d75caa8f4a5e3d51eaa2fabea1a2fbeca (patch)
tree0a8038f401d8a33959a171fe525bfaab2d369e82
parent6257c2aa06967753759db3f7d5b92e496cfbf71c (diff)
downloadmeta-updater-2592e78d75caa8f4a5e3d51eaa2fabea1a2fbeca.tar.gz
Update `installed_versions` passing to new location
-rw-r--r--classes/image_types_ota.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index cd58080..4380494 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -103,7 +103,7 @@ fakeroot do_otasetup () {
103 103
104 cp -a ${IMAGE_ROOTFS}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true 104 cp -a ${IMAGE_ROOTFS}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
105 # Create /var/sota if it doesn't exist yet 105 # Create /var/sota if it doesn't exist yet
106 mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true 106 mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
107 # Ensure the permissions are correctly set 107 # Ensure the permissions are correctly set
108 chmod 700 ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota 108 chmod 700 ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
109 109
@@ -116,7 +116,8 @@ fakeroot do_otasetup () {
116 if [ -n "${GARAGE_TARGET_VERSION}" ]; then 116 if [ -n "${GARAGE_TARGET_VERSION}" ]; then
117 target_version=${GARAGE_TARGET_VERSION} 117 target_version=${GARAGE_TARGET_VERSION}
118 fi 118 fi
119 echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/installed_versions 119 mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import
120 echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions
120 echo "All done. Cleaning up dir: ${HOME_TMP}" 121 echo "All done. Cleaning up dir: ${HOME_TMP}"
121 rm -rf ${HOME_TMP} 122 rm -rf ${HOME_TMP}
122} 123}