grub-efi: move efi packages to run dependencies of grub-efi

Packages like shim, seloader etc. are currently being installed always,
as packages listed in `packagegroup-efi-secure-boot.bb`.

Instead of installing them for each scheme, they should be installed
conditionally, as run dependencies of grub-efi package.

Signed-off-by: Piotr Łobacz <[email protected]>

Author: Dvergatal

meta-efi-secure-boot/recipes-base/packagegroups/packagegroup-efi-secure-boot.bb

@@ -6,16 +6,11 @@ LIC_FILES_CHKSUM = "\
 
 S = "${WORKDIR}"
 
-SELOADER_PKG = "${@'seloader' if d.getVar('UEFI_SELOADER') == '1' else ''}"
 ALLOW_EMPTY:${PN} = "1"
 
 pkgs = "\
     grub-efi \
-    efitools \
     efibootmgr \
-    mokutil \
-    ${SELOADER_PKG} \
-    shim \
 "
 
 RDEPENDS:${PN}:x86 = "${pkgs}"

meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc

@@ -1,3 +1,7 @@
+RDEPENDS:${PN} += "efitools \
+                   ${@'seloader' if d.getVar('UEFI_SELOADER') == '1' else ''} \
+                   ${@'mokutil shim' if d.getVar('MOK_SB') == '1' else ''} \
+                   "
 DEPENDS += "openssl-native"
 FILESEXTRAPATHS:prepend := "${THISDIR}/grub-efi:"