From f2502f90ab3decc5c3faf38ecfd13ac3bce4f411 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Tue, 20 Mar 2018 16:21:33 -0700 Subject: systemd-boot/rmc-boot.inc: update to work with v237 and meson Patch changes: * 0001-sd-boot-Link-RMC-library-into-bootloader-and-stub.patch removed because make is no longer used. * 0001-sd-boot-stub-check-LoadOptions-contains-data.patch removed because it was accepted upstream. * 0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch added to support RMC functionality. Upstream removed a snippet that found the root directory because they didn't need it anymore, but RMC does. * 0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch added to support building with meson instead of make. * Others refreshed inc file changes: * Don't commit pin, we can maintain these patches OK for now * EXTRA_OEMAKE -> EXTRA_OEMESON, and removed some superfluous options Signed-off-by: California Sullivan --- recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc') diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc index 11fddaf9..e27d4951 100644 --- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc +++ b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc @@ -1,21 +1,15 @@ -# Pin systemd revision down for systemd-boot recipe. -# Patches could not be applied cleanly when systemd in OE is updated, -# though we don't expect a lot of changes could happen in bootloader. -# RMC is designed to support a large number of types of boards, so we -# should do explicit update with validation to prevent regression even -# resolving conflicts for a new tip could be done in a short time. - -# Revision: systemd v232 in OE -SRCREV_intel-x86-common = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c" +# This patchset contains hooks that allows systemd-boot to use RMC capablilities. DEPENDS_append_intel-x86-common = " rmc rmc-efi" -EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc -DRMC_EFI"' +EXTRA_OEMESON_append_intel-x86-common = ' \ + -Drmc-includedir="${STAGING_INCDIR}/rmc" \ + ' SRC_URI_append_intel-x86-common = " \ - file://0001-sd-boot-Link-RMC-library-into-bootloader-and-stub.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://0004-sd-boot-Support-global-kernel-command-line-fragment-in-EFI-stub.patch \ - file://0001-sd-boot-stub-check-LoadOptions-contains-data.patch \ + file://0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch \ + file://0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch \ + file://0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \ + file://0004-sd-boot-Support-global-kernel-command-line-fragment.patch \ + file://0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch \ " -- cgit v1.2.3-54-g00ecf