[isar-cip-core,1/1] use qualified path for CIP_IMAGE_OPTIONS

Commit Message

MOESSBAUER, Felix Oct. 1, 2022, 4:52 a.m. UTC

When using the cip-core layer in another layer that has a slightly
different directory structure, bitbake is not able to resolve the
included files.

To fix this, we simply add the full path to the file so bitbake is able
to locate it independent of the downstream layer configuration.

Signed-off-by: Felix Moessbauer <[e-mail]>
---
 kas/opt/ebg-swu.yml  | 2 +-
 kas/opt/swupdate.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index 8b3ffec..78227f1 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml
@@ -20,7 +20,7 @@  local_conf_header:
     SWUPDATE_BOOTLOADER = "efibootguard"
     IMAGE_INSTALL_remove = "u-boot-script"
   ebg_swu_image_options: |
-    CIP_IMAGE_OPTIONS_append = " efibootguard.inc image-uuid.inc"
+    CIP_IMAGE_OPTIONS_append = " recipes-core/images/efibootguard.inc recipes-core/images/image-uuid.inc"
   initramfs: |
     INITRAMFS_INSTALL_append = " initramfs-abrootfs-hook"
   firmware-binaries: |
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 8ba03c9..e32ce20 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -16,7 +16,7 @@  header:
 
 local_conf_header:
   image-option-swupdate: |
-    CIP_IMAGE_OPTIONS_append = " swupdate.inc"
+    CIP_IMAGE_OPTIONS_append = " recipes-core/images/swupdate.inc"
 
   wic-swu: |
     IMAGE_CLASSES += "squashfs"