diff options
author | Anton Gerasimov <anton.gerasimov@here.com> | 2018-01-26 15:49:19 +0100 |
---|---|---|
committer | Anton Gerasimov <anton.gerasimov@here.com> | 2018-01-26 15:49:19 +0100 |
commit | eb790f96e3a1e06ae7304963de6d82327e993350 (patch) | |
tree | 66b7da55f83b00f546f95a1eb0f010bfb8a21d69 /classes/image_types_ota.bbclass | |
parent | f903f757a91fcc192ece9c9cb58f1ab221b7e65a (diff) | |
parent | b68b4ff5bad6e8ae3462a2a6d98b7bb1be12e48f (diff) | |
download | meta-updater-eb790f96e3a1e06ae7304963de6d82327e993350.tar.gz |
Merge branch 'pyro' into rocko
Diffstat (limited to 'classes/image_types_ota.bbclass')
-rw-r--r-- | classes/image_types_ota.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index b827444..e753e0e 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -53,6 +53,8 @@ export OSTREE_BRANCHNAME | |||
53 | export OSTREE_REPO | 53 | export OSTREE_REPO |
54 | export OSTREE_BOOTLOADER | 54 | export OSTREE_BOOTLOADER |
55 | 55 | ||
56 | export GARAGE_TARGET_NAME | ||
57 | |||
56 | IMAGE_CMD_otaimg () { | 58 | IMAGE_CMD_otaimg () { |
57 | if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then | 59 | if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then |
58 | if [ -z "$OSTREE_REPO" ]; then | 60 | if [ -z "$OSTREE_REPO" ]; then |
@@ -106,6 +108,9 @@ IMAGE_CMD_otaimg () { | |||
106 | mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true | 108 | mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true |
107 | # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local) | 109 | # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local) |
108 | install -d ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local | 110 | install -d ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local |
111 | # Set package version for the first deployment | ||
112 | echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${ostree_target_hash}\"}" > ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/installed_versions | ||
113 | |||
109 | rm -rf ${HOME_TMP} | 114 | rm -rf ${HOME_TMP} |
110 | 115 | ||
111 | # Calculate image type | 116 | # Calculate image type |