summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo@foundries.io>2020-10-15 12:27:10 -0300
committerRicardo Salveti <ricardo@foundries.io>2020-10-15 14:21:11 -0300
commitf9e462ef42bcf79beb2b354b5a1c069c8e47d65d (patch)
tree2825eb1c431cbee4e77d7a0ec087aa5555fbe0b3 /classes
parent67ab5b0333cf2c63a6099bab655b836d1b62db78 (diff)
downloadmeta-updater-f9e462ef42bcf79beb2b354b5a1c069c8e47d65d.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.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index e6a0f8b..8f3f5d7 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -6,8 +6,7 @@ SOTA_HARDWARE_ID ??= "${MACHINE}"
6 6
7IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" 7IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest"
8IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ 8IMAGE_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
13IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" 12IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}"