diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-06-26 20:16:02 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2020-07-08 15:52:47 +0200 |
commit | cd677f074169586d59a84a0875dbae466331f557 (patch) | |
tree | 804382e128940635ee2b471ed971277c2ff9e1a7 | |
parent | a4187918cb2b7c1884c1ccd39e6445b4f35fb318 (diff) | |
download | meta-updater-cd677f074169586d59a84a0875dbae466331f557.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.bb | 1 |
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 | } |
51 | do_install[vardepsexclude] = "KERNEL_VERSION" | 51 | do_install[vardepsexclude] = "KERNEL_VERSION" |
52 | INITRAMFS_IMAGE ?= "" | ||
52 | do_install[depends] = "virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']}" | 53 | do_install[depends] = "virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']}" |