diff options
author | Anton Gerasimov <anton.gerasimov@here.com> | 2018-10-09 16:09:19 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-10-31 13:34:40 +0100 |
commit | e7211176e94897f0d0885e9b4fd53d0ccaf8ca89 (patch) | |
tree | 0bb56b2e1020b1657960ba9dd91defe036f42310 /classes | |
parent | e65e6dd24d0114158a7eb02a36d31dab845bac3d (diff) | |
download | meta-updater-e7211176e94897f0d0885e9b4fd53d0ccaf8ca89.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 1d43324..5a17096 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -210,8 +210,10 @@ IMAGE_CMD_garagesign () { | |||
210 | target_version=${ostree_target_hash} | 210 | target_version=${ostree_target_hash} |
211 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then | 211 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then |
212 | target_version=${GARAGE_TARGET_VERSION} | 212 | target_version=${GARAGE_TARGET_VERSION} |
213 | 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" | ||
213 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then | 214 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then |
214 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") | 215 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") |
216 | 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" | ||
215 | fi | 217 | fi |
216 | 218 | ||
217 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 219 | # 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 | ||