diff options
author | cajun-rat <p@beta16.co.uk> | 2017-05-24 08:25:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-24 08:25:07 +0200 |
commit | 0bba62210d1f4d91b1e36f13d5669b606a8fabc6 (patch) | |
tree | 771dd212cf3473ff3c3c3eb4786c431f102bcbed /classes | |
parent | f2ee287a1bc6b73773d2ca2a62f8d53f6083da50 (diff) | |
parent | d84246d351f828aa5a4124e80542237fd3b2e99d (diff) | |
download | meta-updater-0bba62210d1f4d91b1e36f13d5669b606a8fabc6.tar.gz |
Merge pull request #67 from advancedtelematic/fix/machine-prefix
Prefix OSTREE_BRANCHNAME with ${MACHINE}-
Diffstat (limited to 'classes')
-rw-r--r-- | classes/sota.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index b432f68..d786b69 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -15,7 +15,8 @@ EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native | |||
15 | 15 | ||
16 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo | 16 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo |
17 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 17 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" |
18 | OSTREE_BRANCHNAME ?= "ota-${MACHINE}" | 18 | # For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-" |
19 | OSTREE_BRANCHNAME ?= "${MACHINE}-ota" | ||
19 | OSTREE_OSNAME ?= "poky" | 20 | OSTREE_OSNAME ?= "poky" |
20 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 21 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
21 | 22 | ||