diff options
| author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-04-19 16:06:28 +0200 |
|---|---|---|
| committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-04-19 16:06:28 +0200 |
| commit | eae33b943dbf1bd9d863a8255e47726f7cd93418 (patch) | |
| tree | be1b917c1bd49c2c5f3938c38c1634a4faae73e0 /classes | |
| parent | f8a90e45c8cfa8253468cf9376560f6de728169b (diff) | |
| parent | 71d0af75271eff7b5b8c658576d696e99997d57f (diff) | |
| download | meta-updater-eae33b943dbf1bd9d863a8255e47726f7cd93418.tar.gz | |
Merge branch 'morty' into switchupdater
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ota.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index b275930..819a83c 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
| @@ -95,7 +95,7 @@ IMAGE_CMD_otaimg () { | |||
| 95 | # Copy deployment /home and /var/sota to sysroot | 95 | # Copy deployment /home and /var/sota to sysroot |
| 96 | HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` | 96 | HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` |
| 97 | tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true | 97 | tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true |
| 98 | > mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true | 98 | mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true |
| 99 | mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true | 99 | mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true |
| 100 | rm -rf ${HOME_TMP} | 100 | rm -rf ${HOME_TMP} |
| 101 | 101 | ||