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:53:00 +0200 |
| commit | d6ef4e9634e9e50e6ef8fd5b61d5d626a587cc8f (patch) | |
| tree | 51afd439ad58364c17ee5665f194cd9b0dc46f2f | |
| parent | e8398d068e9bc6e5aedd2e2c8876176b48e2f07d (diff) | |
| download | meta-updater-d6ef4e9634e9e50e6ef8fd5b61d5d626a587cc8f.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') == '']}" |