systemd-boot: move systemd-boot.inc into base bbappend

Including a non-existant .inc doesn't cause errors, so just move the
systemd-boot.inc file into the main bbappend. This avoids rebuilding the
package without our changes should grub-efi be the EFI_PROVIDER and we
build systemd-boot, while keeping the RMC changes when rmc-boot is the
EFI_PROVIDER.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>

3 files changed, 6 insertions, 8 deletions

diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
index aea22499..11fddaf9 100644
--- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
+++ b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
@@ -17,6 +17,5 @@ SRC_URI_append_intel-x86-common = " \
             file://0002-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \
             file://0003-sd-boot-Support-global-kernel-command-line-fragment.patch \
             file://0004-sd-boot-Support-global-kernel-command-line-fragment-in-EFI-stub.patch \
-            file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
             file://0001-sd-boot-stub-check-LoadOptions-contains-data.patch \
             "
diff --git a/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc
deleted file mode 100644
index 788e57af..00000000
--- a/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" '
-
-SRC_URI_append_intel-x86-common = " \
-            file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
-            "
-
diff --git a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
index 48968116..9e6cc161 100644
--- a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
+++ b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
@@ -1,6 +1,8 @@
 FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/systemd-boot:"
 
-include systemd-boot/${EFI_PROVIDER}.inc
+SRC_URI_append_intel-x86-common = " \
+            file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
+            "
 
 PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
 
@@ -11,3 +13,6 @@ do_compile_append_intel-x86-common() {
 do_deploy_append_intel-x86-common() {
         install ${B}/linux*.efi.stub ${DEPLOYDIR}
 }
+
+# includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER
+include systemd-boot/${EFI_PROVIDER}.inc