diff options
| author | lbonn <lbonn@users.noreply.github.com> | 2018-05-16 16:23:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 16:23:48 +0200 |
| commit | a694dc7ff1dc08cef9ddade0327befa155a3a853 (patch) | |
| tree | 3ec6119050fe4362d9604d168daa8ed527029af7 /classes/sota.bbclass | |
| parent | 41c2df71f443047ea6d6adb988f17eb493f10f89 (diff) | |
| parent | 7e6ffbce3f8717d91142d1e80d7cda279f24145a (diff) | |
| download | meta-updater-a694dc7ff1dc08cef9ddade0327befa155a3a853.tar.gz | |
Merge pull request #311 from advancedtelematic/fix/PRO-5376/backport-master-fixes
Backport from master to rocko
Diffstat (limited to 'classes/sota.bbclass')
| -rw-r--r-- | classes/sota.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 1e765f0..38d4ce5 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
| @@ -20,13 +20,15 @@ WKS_FILE_sota ?= "sdimage-sota.wks" | |||
| 20 | 20 | ||
| 21 | EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native" | 21 | EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native" |
| 22 | 22 | ||
| 23 | OSTREE_INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" | ||
| 24 | |||
| 23 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo | 25 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo |
| 24 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 26 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" |
| 25 | # For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-" | 27 | # For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-" |
| 26 | OSTREE_BRANCHNAME ?= "${MACHINE}" | 28 | OSTREE_BRANCHNAME ?= "${MACHINE}" |
| 27 | OSTREE_OSNAME ?= "poky" | 29 | OSTREE_OSNAME ?= "poky" |
| 28 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 30 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
| 29 | 31 | OSTREE_BOOTLOADER ??= 'u-boot' | |
| 30 | 32 | ||
| 31 | GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" | 33 | GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" |
| 32 | GARAGE_SIGN_KEYNAME ?= "garage-key" | 34 | GARAGE_SIGN_KEYNAME ?= "garage-key" |