summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-01-18 00:38:54 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-01-23 00:24:23 (GMT)
commit7fa26da6c6cc5c32e1ef3ca7a3127b20e4a9e987 (patch)
tree4c33278bb3e407671685a2d518121c40ee3d138e
parentde43a8f89f3e68930666847adf96e1824e28b5e1 (diff)
downloadmeta-intel-7fa26da6c6cc5c32e1ef3ca7a3127b20e4a9e987.tar.gz
systemd-boot: move systemd-boot.inc into base bbappend
Including a non-existant .inc doesn't cause errors, so just move the systemd-boot.inc file into the main bbappend. This avoids rebuilding the package without our changes should grub-efi be the EFI_PROVIDER and we build systemd-boot, while keeping the RMC changes when rmc-boot is the EFI_PROVIDER. Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r--recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc1
-rw-r--r--recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc6
-rw-r--r--recipes-bsp/systemd-boot/systemd-boot_%.bbappend7
3 files changed, 6 insertions, 8 deletions
diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
index aea2249..11fddaf 100644
--- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
+++ b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
@@ -17,6 +17,5 @@ SRC_URI_append_intel-x86-common = " \
17 file://0002-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \ 17 file://0002-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \
18 file://0003-sd-boot-Support-global-kernel-command-line-fragment.patch \ 18 file://0003-sd-boot-Support-global-kernel-command-line-fragment.patch \
19 file://0004-sd-boot-Support-global-kernel-command-line-fragment-in-EFI-stub.patch \ 19 file://0004-sd-boot-Support-global-kernel-command-line-fragment-in-EFI-stub.patch \
20 file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
21 file://0001-sd-boot-stub-check-LoadOptions-contains-data.patch \ 20 file://0001-sd-boot-stub-check-LoadOptions-contains-data.patch \
22 " 21 "
diff --git a/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc
deleted file mode 100644
index 788e57a..0000000
--- a/recipes-bsp/systemd-boot/systemd-boot/systemd-boot.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" '
2
3SRC_URI_append_intel-x86-common = " \
4 file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
5 "
6
diff --git a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
index 4896811..9e6cc16 100644
--- a/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
+++ b/recipes-bsp/systemd-boot/systemd-boot_%.bbappend
@@ -1,6 +1,8 @@
1FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/systemd-boot:" 1FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/systemd-boot:"
2 2
3include systemd-boot/${EFI_PROVIDER}.inc 3SRC_URI_append_intel-x86-common = " \
4 file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \
5 "
4 6
5PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}" 7PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
6 8
@@ -11,3 +13,6 @@ do_compile_append_intel-x86-common() {
11do_deploy_append_intel-x86-common() { 13do_deploy_append_intel-x86-common() {
12 install ${B}/linux*.efi.stub ${DEPLOYDIR} 14 install ${B}/linux*.efi.stub ${DEPLOYDIR}
13} 15}
16
17# includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER
18include systemd-boot/${EFI_PROVIDER}.inc