From de43a8f89f3e68930666847adf96e1824e28b5e1 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 17 Jan 2018 14:18:31 -0800 Subject: systemd-boot: move commit pinning to rmc-boot.inc systemd-boot shouldn't be stuck on a certain commit just because RMC is. This effectively upgrades our systemd-boot version from v232 to v234. We also get to drop a patch that was accepted upstream. Signed-off-by: California Sullivan --- recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc | 10 ++++++++++ recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc | 1 - recipes-bsp/systemd-boot/systemd-boot_%.bbappend | 10 ---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc index 1172d53d..aea22499 100644 --- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc +++ b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc @@ -1,3 +1,13 @@ +# 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" + 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"' diff --git a/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc index fcce6ce1..788e57af 100644 --- a/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc +++ b/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc @@ -2,6 +2,5 @@ EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/ SRC_URI_append_intel-x86-common = " \ 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_%.bbappend b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend index 557c0493..48968116 100644 --- a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend +++ b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend @@ -1,15 +1,5 @@ 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, -# 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" - include systemd-boot/${EFI_PROVIDER}.inc PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}" -- cgit v1.2.3-54-g00ecf