diff options
| author |   Anton Gerasimov <anton@advancedtelematic.com> | 2017-03-30 13:31:36 +0200 |
|---|---|---|
| committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-04-04 11:37:43 +0200 |
| commit | 1c2571e37c6fa5e0ac3bb035173ae07a187648c5 (patch) | |
| tree | 681d094eb924f1b5f7ecce6adbb08ce4e4eb2509 /meta-sota/classes/image_types_ostree.bbclass | |
| parent | 497d7db5bfc71367c6393a09a2f768b812fce83f (diff) | |
Update SOTA-related software
Support for grub2 has been added, rust's json parser temporarily
replaced with python-canonicaljson because of compatibility issues.
Change-Id: I6665ed3ad56afc90f0e82eb90993c8656be16d5f
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'meta-sota/classes/image_types_ostree.bbclass')
| -rw-r--r-- | meta-sota/classes/image_types_ostree.bbclass | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass index 04aeae8..1bbeb2d 100644 --- a/meta-sota/classes/image_types_ostree.bbclass +++ b/meta-sota/classes/image_types_ostree.bbclass @@ -58,6 +58,10 @@ IMAGE_CMD_ostree () { echo "d /var/rootdirs 0755 root root -" >>${tmpfiles_conf} echo "L /var/rootdirs/home - - - - /sysroot/home" >>${tmpfiles_conf} + + # Preserve OSTREE_BRANCHNAME for future information + mkdir -p usr/share/sota/ + echo -n "${OSTREE_BRANCHNAME}" > usr/share/sota/branchname # Preserve data in /home to be later copied to /sysroot/home by # sysroot generating procedure mkdir -p usr/homedirs @@ -100,6 +104,9 @@ IMAGE_CMD_ostree () { cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum} cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum} + # Copy image manifest + cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest + cd ${WORKDIR} # Create a tarball that can be then commited to OSTree repo @@ -130,6 +137,7 @@ IMAGE_CMD_ostreepush () { if [ ${OSTREE_PUSH_CREDENTIALS} ]; then garage-push --repo=${OSTREE_REPO} \ --ref=${OSTREE_BRANCHNAME} \ - --credentials=${OSTREE_PUSH_CREDENTIALS} + --credentials=${OSTREE_PUSH_CREDENTIALS} \ + --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt fi } |