summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2018-09-14 17:46:42 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-09-21 13:55:39 +0200
commit59c0347ac0731766f030de3df63f3792d6034a99 (patch)
tree3efdce8156b694936294f8601abfbd24b2267528
parentce01a745ed350cb79fdeabe0c4173ab7d30705d2 (diff)
downloadmeta-updater-59c0347ac0731766f030de3df63f3792d6034a99.tar.gz
Update `installed_versions` passing to new location
-rw-r--r--classes/image_types_ota.bbclass6
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb2
2 files changed, 5 insertions, 3 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 360b746..4a51f24 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -99,7 +99,7 @@ IMAGE_CMD_otaimg () {
99 99
100 cp -a ${IMAGE_ROOTFS}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true 100 cp -a ${IMAGE_ROOTFS}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
101 # Create /var/sota if it doesn't exist yet 101 # Create /var/sota if it doesn't exist yet
102 mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true 102 mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
103 # Ensure the permissions are correctly set 103 # Ensure the permissions are correctly set
104 chmod 700 ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota 104 chmod 700 ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
105 105
@@ -112,7 +112,9 @@ IMAGE_CMD_otaimg () {
112 if [ -n "${GARAGE_TARGET_VERSION}" ]; then 112 if [ -n "${GARAGE_TARGET_VERSION}" ]; then
113 target_version=${GARAGE_TARGET_VERSION} 113 target_version=${GARAGE_TARGET_VERSION}
114 fi 114 fi
115 echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/installed_versions 115 mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import
116 echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions
117
116 rm -rf ${HOME_TMP} 118 rm -rf ${HOME_TMP}
117 119
118 # Calculate image type 120 # Calculate image type
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 445f11e..16f4e41 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -27,7 +27,7 @@ SRC_URI = " \
27 file://aktualizr-secondary.socket \ 27 file://aktualizr-secondary.socket \
28 file://aktualizr-serialcan.service \ 28 file://aktualizr-serialcan.service \
29 " 29 "
30SRCREV = "8083d4fa67046689d4bf784b908a048a58457d63" 30SRCREV = "090c463c6f1ec7a7ceae963cd7b4ba99aa74e1f5"
31BRANCH ?= "master" 31BRANCH ?= "master"
32 32
33S = "${WORKDIR}/git" 33S = "${WORKDIR}/git"