[meta-intel] [PATCH] systemd-boot%.bbappend: rename to match the versioned recipe

Mikko Ylinen mikko.ylinen at intel.com
Fri Dec 23 03:48:02 PST 2016


OE-Core recently renamed the recipe to have PV in the name
and the bbappend wildcard was added to make the transition
smooth.

The renaming is now complete so rename the bbappend again
to match the new versioned recipe only.

The aggresive systemd-boot% wildcard matches systemd-bootchart
too giving unexpected results.

Depends on OE-Core 8fe1e5197f6f94a49693de09f4eb9394df531cc8.

Signed-off-by: Mikko Ylinen <mikko.ylinen at intel.com>
---
 .../systemd-boot/systemd-boot%.bbappend            | 24 ----------------------
 .../systemd-boot/systemd-boot_%.bbappend           | 24 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 common/recipes-bsp/systemd-boot/systemd-boot%.bbappend
 create mode 100644 common/recipes-bsp/systemd-boot/systemd-boot_%.bbappend

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 2aecc3f..0000000
--- 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}"
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 0000000..2aecc3f
--- /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}"
-- 
2.11.0

---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki 
Business Identity Code: 0357606 - 4 
Domiciled in Helsinki 

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.



More information about the meta-intel mailing list