diff options
author | Anton Gerasimov <anton.gerasimov@here.com> | 2018-01-19 16:38:13 +0100 |
---|---|---|
committer | Anton Gerasimov <anton.gerasimov@here.com> | 2018-01-19 16:40:02 +0100 |
commit | 9e6d437d73aa990aff85d2cf456b77367be01920 (patch) | |
tree | a28a78727f7fea13abe6cf3249dc9c14865b91f4 /classes | |
parent | de0d91f6a870494963c67c70460999927e8d9e1f (diff) | |
download | meta-updater-9e6d437d73aa990aff85d2cf456b77367be01920.tar.gz |
Deploy initial primary version information
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_ostree.bbclass | 4 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index cf2e52f..dcc376d 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -12,6 +12,8 @@ IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ | |||
12 | export OSTREE_REPO | 12 | export OSTREE_REPO |
13 | export OSTREE_BRANCHNAME | 13 | export OSTREE_BRANCHNAME |
14 | 14 | ||
15 | export GARAGE_TARGET_NAME | ||
16 | |||
15 | RAMDISK_EXT ?= ".ext4.gz" | 17 | RAMDISK_EXT ?= ".ext4.gz" |
16 | RAMDISK_EXT_arm ?= ".ext4.gz.u-boot" | 18 | RAMDISK_EXT_arm ?= ".ext4.gz.u-boot" |
17 | 19 | ||
@@ -205,7 +207,7 @@ IMAGE_CMD_garagesign () { | |||
205 | push_success=0 | 207 | push_success=0 |
206 | for push_retries in $( seq 3 ); do | 208 | for push_retries in $( seq 3 ); do |
207 | garage-sign targets pull --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} | 209 | garage-sign targets pull --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} |
208 | garage-sign targets add --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --name ${OSTREE_BRANCHNAME} --format OSTREE --version ${ostree_target_hash} --length 0 --url "https://example.com/" --sha256 ${ostree_target_hash} --hardwareids ${MACHINE} | 210 | garage-sign targets add --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --name ${GARAGE_TARGET_NAME} --format OSTREE --version ${ostree_target_hash} --length 0 --url "https://example.com/" --sha256 ${ostree_target_hash} --hardwareids ${MACHINE} |
209 | garage-sign targets sign --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --key-name=targets | 211 | garage-sign targets sign --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} --key-name=targets |
210 | errcode=0 | 212 | errcode=0 |
211 | garage-sign targets push --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} || errcode=$? | 213 | garage-sign targets push --repo tufrepo --home-dir ${GARAGE_SIGN_REPO} || errcode=$? |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 5dc4811..be9a017 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 |