diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-15 09:27:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 09:27:41 +0100 |
| commit | 59b9fa9a1410f83b1146b48e961b0f2be95415d7 (patch) | |
| tree | 231f2a950c126e2ae7663d05c85c3655638cc50a /classes | |
| parent | b6bec0a5abe3dba3907e06af63335ad9e4c9d9e0 (diff) | |
| parent | 84913d17a11cbc3ec357ed91bdc725db6b639469 (diff) | |
| download | meta-updater-59b9fa9a1410f83b1146b48e961b0f2be95415d7.tar.gz | |
Merge pull request #254 from rsalveti/initramfs
Replace INITRAMFS_FSTYPES with OSTREE_INITRAMFS_FSTYPES
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
| -rw-r--r-- | classes/sota.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 904db96..5893e8d 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -10,7 +10,7 @@ do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ | |||
| 10 | export OSTREE_REPO | 10 | export OSTREE_REPO |
| 11 | export OSTREE_BRANCHNAME | 11 | export OSTREE_BRANCHNAME |
| 12 | 12 | ||
| 13 | RAMDISK_EXT ?= ".${INITRAMFS_FSTYPES}" | 13 | RAMDISK_EXT ?= ".${OSTREE_INITRAMFS_FSTYPES}" |
| 14 | export GARAGE_TARGET_NAME | 14 | export GARAGE_TARGET_NAME |
| 15 | 15 | ||
| 16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 2a12e8f..6531809 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
| @@ -20,7 +20,7 @@ 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 | INITRAMFS_FSTYPES = "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" | 23 | OSTREE_INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" |
| 24 | 24 | ||
| 25 | # 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 |
| 26 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 26 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" |