diff options
| author | Laurent Bonnans <laurent.bonnans@here.com> | 2018-09-14 17:46:42 +0200 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-09-21 14:01:44 +0200 |
| commit | e387dcf0f9e0a5275d6a9fe5cc300410a95b00df (patch) | |
| tree | 924b566713a9c3293e3a90a7d68b3953b5c759dc | |
| parent | 99a53ec5c0f2c5a021215727a0220da9abb5a668 (diff) | |
| download | meta-updater-e387dcf0f9e0a5275d6a9fe5cc300410a95b00df.tar.gz | |
Update `installed_versions` passing to new location
| -rw-r--r-- | classes/image_types_ota.bbclass | 6 | ||||
| -rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 2 |
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 fd2fdd5..9112546 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
| @@ -26,7 +26,7 @@ SRC_URI = " \ | |||
| 26 | file://aktualizr-secondary.socket \ | 26 | file://aktualizr-secondary.socket \ |
| 27 | file://aktualizr-serialcan.service \ | 27 | file://aktualizr-serialcan.service \ |
| 28 | " | 28 | " |
| 29 | SRCREV = "8083d4fa67046689d4bf784b908a048a58457d63" | 29 | SRCREV = "090c463c6f1ec7a7ceae963cd7b4ba99aa74e1f5" |
| 30 | BRANCH ?= "master" | 30 | BRANCH ?= "master" |
| 31 | 31 | ||
| 32 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
