From 6e9bad66daa41153582c50398cd9abf54ffddeb2 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Mon, 11 Sep 2017 17:31:29 -0700 Subject: systemd-boot: fix Yocto Project compatibility issue do_compile and do_deploy were being appended to unconditionally. Fix the issue by using the intel-x86-common MACHINEOVERRIDE. Signed-off-by: California Sullivan Signed-off-by: Saul Wold --- common/recipes-bsp/systemd-boot/systemd-boot_%.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/common/recipes-bsp/systemd-boot/systemd-boot_%.bbappend index 9e407ea5..557c0493 100644 --- a/common/recipes-bsp/systemd-boot/systemd-boot_%.bbappend +++ b/common/recipes-bsp/systemd-boot/systemd-boot_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-boot:" +FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/systemd-boot:" # Pin systemd revision down for systemd-boot recipe. # Patches could not be applied cleanly when systemd in OE is updated, @@ -14,10 +14,10 @@ include systemd-boot/${EFI_PROVIDER}.inc PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}" -do_compile_append() { +do_compile_append_intel-x86-common() { oe_runmake linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub } -do_deploy_append() { +do_deploy_append_intel-x86-common() { install ${B}/linux*.efi.stub ${DEPLOYDIR} } -- cgit v1.2.3-54-g00ecf