summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-06-26 20:16:02 +0200
committerMing Liu <ming.liu@toradex.com>2020-06-29 14:21:36 +0200
commitb712720da6d82e2a4b43f89c380cd33e2ddce86d (patch)
tree718c2ecd4cafa46edd46e37afb82dedbdb78738a
parent6a0fa6a8a4e66fb1502e2ff2e1b708eb45d4e179 (diff)
downloadmeta-updater-b712720da6d82e2a4b43f89c380cd33e2ddce86d.tar.gz
ostree-kernel-initramfs: fix parsing for MACHINEs which don't define INITRAMFS_IMAGE
* when INITRAMFS_IMAGE isn't defined at all, the "d.getVar('INITRAMFS_IMAGE') == ''" part doesn't do anything useful, because the unexpanded version of this ends in do_install[depends] variable and breaks parsing: meta-updater/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb:do_install[depends], dependency ''][d.getVar('INITRAMFS_IMAGE') in 'virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']} virtual/fakeroot-native:do_populate_sysroot' does not contain exactly one ':' character. Task 'depends' should be specified in the form 'packagename:task' Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
index fe8a9cc..9139c7f 100644
--- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
+++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
@@ -49,4 +49,5 @@ do_install() {
49 fi 49 fi
50} 50}
51do_install[vardepsexclude] = "KERNEL_VERSION" 51do_install[vardepsexclude] = "KERNEL_VERSION"
52INITRAMFS_IMAGE ?= ""
52do_install[depends] = "virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']}" 53do_install[depends] = "virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']}"