[PATCH v2 2/6] buildchroot: Break up wic build deps into common and arch-specific ones

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

wic is currently not usable on non-x86 archs because of naturally
unresolvable dependencies on x86 grub-efi packages. Fix this by
factoring our a common dependency core and a set of arch-specific ones.
This should also allow to build EFI images for armhf and arm64
(Tianocore firmware or U-boot in EFI mode). But primarily, it allows to
build non-EFI images on non-x86 archs via wic.

Note that we should probably consider replacing the Isar-proprietary
BUILDCHROOT_PREINSTALL_WIC variable with the OE standard
WIC_FILE_DEPENDS*.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-devtools/buildchroot/buildchroot.bb | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index cec42c3..e405509 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -32,15 +32,27 @@ BUILDCHROOT_PREINSTALL_WIC = " \
                              parted \
                              gdisk \
                              util-linux \
-                             syslinux \
-                             syslinux-common \
                              dosfstools \
                              mtools \
                              e2fsprogs \
-                             grub-efi-amd64-bin \
-                             grub-efi-ia32-bin \
                              python3"
 
+BUILDCHROOT_PREINSTALL_WIC_append_amd64 = " \
+                             syslinux \
+                             syslinux-common \
+                             grub-efi-amd64-bin"
+
+BUILDCHROOT_PREINSTALL_WIC_append_armhf = " \
+                             grub-efi-arm-bin"
+
+BUILDCHROOT_PREINSTALL_WIC_append_arm64 = " \
+                             grub-efi-arm64-bin"
+
+BUILDCHROOT_PREINSTALL_WIC_append_i386 = " \
+                             syslinux \
+                             syslinux-common \
+                             grub-efi-ia32-bin"
+
 python () {
     if d.getVar('IMAGE_TYPE', True) == 'wic-img':
         d.appendVar('BUILDCHROOT_PREINSTALL',
-- 
2.13.7