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 <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
California Sullivan 2017-09-11 17:31:29 -07:00 committed by Saul Wold
parent 868758cc66
commit 6e9bad66da

View File

@ -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}
}