From 4092ce98511e1eeb032515e2f817494ecc37d0cc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 5 Dec 2016 23:28:40 +0000 Subject: systemd-boot.bbappend: Rename to use wildcard OE-Core is in process of renaming the recipe to have PV in recipe name. Cover that case for bbappend Signed-off-by: Khem Raj Signed-off-by: California Sullivan --- .../systemd-boot/systemd-boot%.bbappend | 24 ++++++++++++++++++++++ .../recipes-bsp/systemd-boot/systemd-boot.bbappend | 24 ---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 common/recipes-bsp/systemd-boot/systemd-boot%.bbappend delete mode 100644 common/recipes-bsp/systemd-boot/systemd-boot.bbappend (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 new file mode 100644 index 00000000..2aecc3f9 --- /dev/null +++ b/common/recipes-bsp/systemd-boot/systemd-boot%.bbappend @@ -0,0 +1,24 @@ +DEPENDS_append_intel-x86-common = " rmc" + +FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-boot:" + +EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc -DRMC_EFI"' + +# 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 230 in OE +SRCREV_intel-x86-common = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba" + +SRC_URI_append_intel-x86-common = " \ + file://0001-sd-boot-Link-RMC-library-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}" diff --git a/common/recipes-bsp/systemd-boot/systemd-boot.bbappend b/common/recipes-bsp/systemd-boot/systemd-boot.bbappend deleted file mode 100644 index 2aecc3f9..00000000 --- a/common/recipes-bsp/systemd-boot/systemd-boot.bbappend +++ /dev/null @@ -1,24 +0,0 @@ -DEPENDS_append_intel-x86-common = " rmc" - -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-boot:" - -EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc -DRMC_EFI"' - -# 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 230 in OE -SRCREV_intel-x86-common = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba" - -SRC_URI_append_intel-x86-common = " \ - file://0001-sd-boot-Link-RMC-library-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