summaryrefslogtreecommitdiffstats
path: root/meta-sota/classes
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2016-11-21 16:41:03 +0100
committerAnton Gerasimov <anton@advancedtelematic.com>2016-11-23 15:27:17 +0100
commitc0bfe0c519deed4e8cb3250e56e14db08a5d8750 (patch)
tree160b6991710591fdfc20dfad1a8d75f4fe658e6b /meta-sota/classes
parentd1c5151b80a13ac0d17b20a7e38453ab96c1a703 (diff)
Bump versions of meta-sota utilities
Authenticated OSTree pull and push is added to sota_tools, ostree and sota-client. Change-Id: I36a4d3d24826ab8776bc980b50aef8606af9e7a8 Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'meta-sota/classes')
-rw-r--r--meta-sota/classes/image_types_ostree.bbclass14
1 files changed, 2 insertions, 12 deletions
diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass
index 453692e..32ea98f 100644
--- a/meta-sota/classes/image_types_ostree.bbclass
+++ b/meta-sota/classes/image_types_ostree.bbclass
@@ -127,19 +127,9 @@ IMAGE_CMD_ostree () {
IMAGE_TYPEDEP_ostreepush = "ostree"
IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
IMAGE_CMD_ostreepush () {
- if [ ${OSTREE_REMOTE_URL} ]; then
- if [ -z ${OSTREE_REMOTE_USER} ]; then
- bberror "OSTREE_REMOTE_PASSWORD isn't set"
- fi
-
- if [ -z ${OSTREE_REMOTE_PASSWORD} ]; then
- bberror "OSTREE_REMOTE_PASSWORD isn't set"
- fi
-
+ if [ ${OSTREE_PUSH_CREDENTIALS} ]; then
garage-push --repo=${OSTREE_REPO} \
--ref=${OSTREE_BRANCHNAME} \
- --url=${OSTREE_REMOTE_URL} \
- --user=${OSTREE_REMOTE_USER} \
- --password=${OSTREE_REMOTE_PASSWORD}
+ --credentials=${OSTREE_PUSH_CREDENTIALS}
fi
}