From 1484a008eb141b0de3e28a8eedbd1cad41f2bb6f Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 2 Nov 2016 13:38:24 -0700 Subject: systemd-boot: Make use of new override Add the new intel-x86-common to the meta-data in order to limit the changes when the meta-intel layer is included without using meta-intel machines. Signed-off-by: Saul Wold --- common/recipes-bsp/systemd-boot/systemd-boot.bbappend | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'common/recipes-bsp') diff --git a/common/recipes-bsp/systemd-boot/systemd-boot.bbappend b/common/recipes-bsp/systemd-boot/systemd-boot.bbappend index 0da0c46a..ed317554 100644 --- a/common/recipes-bsp/systemd-boot/systemd-boot.bbappend +++ b/common/recipes-bsp/systemd-boot/systemd-boot.bbappend @@ -1,8 +1,8 @@ -DEPENDS += "rmc" +DEPENDS_append_intel-x86-common = " rmc" FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-boot:" -EXTRA_OEMAKE += 'EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc/efi -DRMC_EFI"' +EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc/efi -DRMC_EFI"' # Pin systemd revision down for systemd-boot recipe. # Patches could not be applied cleanly when systemd in OE is updated, @@ -12,10 +12,13 @@ EXTRA_OEMAKE += 'EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STA # resolving conflicts for a new tip could be done in a short time. # Revision: systemd 230 in OE -SRCREV = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba" +SRCREV_intel-x86-common = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba" -SRC_URI += "file://0001-sd-boot-Link-RMC-libraries-into-bootloader.patch \ +SRC_URI_append_intel-x86-common = " \ + file://0001-sd-boot-Link-RMC-libraries-into-bootloader.patch \ 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://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \ " + +PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}" -- cgit v1.2.3-54-g00ecf