diff options
| author | Ricardo Salveti <ricardo@foundries.io> | 2020-10-15 12:27:10 -0300 |
|---|---|---|
| committer | Anatoliy Odukha <aodukha@gmail.com> | 2020-10-29 13:42:12 +0200 |
| commit | 1118ab2e1f36a475472d534e0f6665a5508a41be (patch) | |
| tree | 194449223f55587839b54ca14898211a5c0beff6 /classes | |
| parent | 6c6260c857f58b817d24ed662b58bfb9930c9070 (diff) | |
| download | meta-updater-1118ab2e1f36a475472d534e0f6665a5508a41be.tar.gz | |
ostree-kernel-initramfs: add back initramfs fit workaround
Previous initramfs fit specific workaround was removed as part of commit
6eecf1593d, causing ostree to provide an init argument as part of the
kernel command line arguments when it is not really needed.
Bring back the workaround by simply generating an empty file in case
kernel image type is fit and initramfs is also used by the target.
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/sota.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index fbd92b5..9241952 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
| @@ -6,8 +6,7 @@ SOTA_HARDWARE_ID ??= "${MACHINE}" | |||
| 6 | 6 | ||
| 7 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" | 7 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" |
| 8 | IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ | 8 | IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ |
| 9 | ostree os-release ostree-kernel \ | 9 | ostree os-release ostree-kernel ostree-initramfs \ |
| 10 | ${@'ostree-initramfs' if d.getVar('KERNEL_IMAGETYPE') != 'fitImage' else ''} \ | ||
| 11 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" | 10 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" |
| 12 | 11 | ||
| 13 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" | 12 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" |