diff options
| author | Anton Gerasimov <anton.gerasimov@here.com> | 2018-10-09 16:09:19 +0200 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-10-30 13:40:19 +0100 |
| commit | 6c3f7564ea6fabdb6b882ef0a6f3d24af46979d0 (patch) | |
| tree | 462cc9f8e48a86f8319d09dc27a8b20fa7d90f60 /classes | |
| parent | 824e5a7c9c4241d0f32ee777768b00249b47ad8a (diff) | |
| download | meta-updater-6c3f7564ea6fabdb6b882ef0a6f3d24af46979d0.tar.gz | |
Document version overriding and add warnings
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
| -rw-r--r-- | classes/target_version_example.bbclass | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index bcbb648..74282ef 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -219,8 +219,10 @@ IMAGE_CMD_garagesign () { | |||
| 219 | target_version=${ostree_target_hash} | 219 | target_version=${ostree_target_hash} |
| 220 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then | 220 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then |
| 221 | target_version=${GARAGE_TARGET_VERSION} | 221 | target_version=${GARAGE_TARGET_VERSION} |
| 222 | bbwarn "Target version is overriden with GARAGE_TARGET_VERSION variable. It is a dangerous operation, make sure you've read the respective secion in meta-updater/README.adoc" | ||
| 222 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then | 223 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then |
| 223 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") | 224 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") |
| 225 | bbwarn "Target version is overriden with target_version file. It is a dangerous operation, make sure you've read the respective secion in meta-updater/README.adoc" | ||
| 224 | fi | 226 | fi |
| 225 | 227 | ||
| 226 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 228 | # Push may fail due to race condition when multiple build machines try to push simultaneously |
diff --git a/classes/target_version_example.bbclass b/classes/target_version_example.bbclass index 5adf159..ef119fb 100644 --- a/classes/target_version_example.bbclass +++ b/classes/target_version_example.bbclass | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | # Writes uses repo manifest version as a target version | 1 | # Writes target version to be used by garage-sign |
| 2 | # | ||
| 3 | 2 | ||
| 4 | HOSTTOOLS += " git " | 3 | HOSTTOOLS += " git " |
| 5 | 4 | ||
