diff options
| author | lbonn <lbonn@users.noreply.github.com> | 2019-08-19 13:36:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 13:36:41 +0200 |
| commit | 3bc650084e9db3320c67b6e5abe36920080ff576 (patch) | |
| tree | 555f6f83fc1870302f2ee04b4e30c2e1a0c2ebb3 | |
| parent | e8ec175e9d7329c07a8632048eb8a2f18eac2731 (diff) | |
| parent | f865c4016793c63624254c0b4b5069647d76f754 (diff) | |
| download | meta-updater-3bc650084e9db3320c67b6e5abe36920080ff576.tar.gz | |
Merge pull request #587 from advancedtelematic/fix/grub-ostree
Expose OSTREE_BOOT_PARTITION in do_image_ota
| -rw-r--r-- | classes/image_types_ota.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 12375ec..31e3887 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
| @@ -45,6 +45,8 @@ do_image_ota[cleandirs] = "${OTA_SYSROOT}" | |||
| 45 | do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ | 45 | do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ |
| 46 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}" | 46 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}" |
| 47 | IMAGE_CMD_ota () { | 47 | IMAGE_CMD_ota () { |
| 48 | export OSTREE_BOOT_PARTITION=${OSTREE_BOOT_PARTITION} | ||
| 49 | |||
| 48 | ostree admin --sysroot=${OTA_SYSROOT} init-fs ${OTA_SYSROOT} | 50 | ostree admin --sysroot=${OTA_SYSROOT} init-fs ${OTA_SYSROOT} |
| 49 | ostree admin --sysroot=${OTA_SYSROOT} os-init ${OSTREE_OSNAME} | 51 | ostree admin --sysroot=${OTA_SYSROOT} os-init ${OSTREE_OSNAME} |
| 50 | mkdir -p ${OTA_SYSROOT}/boot/loader.0 | 52 | mkdir -p ${OTA_SYSROOT}/boot/loader.0 |