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/image_types_ostree.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/image_types_ostree.bbclass')
| -rw-r--r-- | classes/image_types_ostree.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 9e3bc6f..bc44e33 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -11,12 +11,11 @@ export OSTREE_REPO | |||
| 11 | export OSTREE_BRANCHNAME | 11 | export OSTREE_BRANCHNAME |
| 12 | export GARAGE_TARGET_NAME | 12 | export GARAGE_TARGET_NAME |
| 13 | 13 | ||
| 14 | RAMDISK_EXT ?= ".ext4.gz" | 14 | RAMDISK_EXT ?= ".${OSTREE_INITRAMFS_FSTYPES}" |
| 15 | RAMDISK_EXT_arm ?= ".ext4.gz.u-boot" | ||
| 16 | 15 | ||
| 17 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
| 18 | 17 | ||
| 19 | export SYSTEMD_USED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', '', d)}" | 18 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
| 20 | 19 | ||
| 21 | IMAGE_CMD_ostree () { | 20 | IMAGE_CMD_ostree () { |
| 22 | if [ -z "$OSTREE_REPO" ]; then | 21 | if [ -z "$OSTREE_REPO" ]; then |