diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2018-03-21 15:16:20 -0700 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2018-03-22 08:29:50 -0700 |
commit | 3342d3715ec829f720e1590f45ad84e6b7226145 (patch) | |
tree | f2ee0a5fd49356cc597249941bc7e162acf3be9a /recipes-bsp/systemd-boot | |
parent | f2502f90ab3decc5c3faf38ecfd13ac3bce4f411 (diff) | |
download | meta-intel-3342d3715ec829f720e1590f45ad84e6b7226145.tar.gz |
systemd-boot/rmc-boot.inc: make it work with EFI image enhancements
Give it an RPROVIDES rmc-boot so that EFI_PROVIDER rmc-boot can be used
as an install target. RDEPENDS on rmc-db to satisfy its runtime
dependencies. Also add python snippet to set its IMAGE/IMAGE_PREFIX
target for when its chosen as EFI_PROVIDER.
These changes let it work well with the new wks.in file, where
previously it couldn't work with wic at all.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'recipes-bsp/systemd-boot')
-rw-r--r-- | recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc index e27d4951..bbe3aea2 100644 --- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc +++ b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc | |||
@@ -1,6 +1,19 @@ | |||
1 | # This patchset contains hooks that allows systemd-boot to use RMC capablilities. | 1 | # This patchset contains hooks that allows systemd-boot to use RMC capablilities. |
2 | python __anonymous () { | ||
3 | import re | ||
4 | target = d.getVar('TARGET_ARCH') | ||
5 | prefix = "" if d.getVar('EFI_PROVIDER') == "rmc-boot" else "systemd-" | ||
6 | if target == "x86_64": | ||
7 | systemdimage = prefix + "bootx64.efi" | ||
8 | else: | ||
9 | systemdimage = prefix + "bootia32.efi" | ||
10 | d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) | ||
11 | prefix = "systemd-" if prefix == "" else "" | ||
12 | d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) | ||
13 | } | ||
2 | 14 | ||
3 | DEPENDS_append_intel-x86-common = " rmc rmc-efi" | 15 | DEPENDS_append_intel-x86-common = " rmc rmc-efi" |
16 | RDEPENDS_${PN}_append_intel-x86-common = " rmc-db" | ||
4 | 17 | ||
5 | EXTRA_OEMESON_append_intel-x86-common = ' \ | 18 | EXTRA_OEMESON_append_intel-x86-common = ' \ |
6 | -Drmc-includedir="${STAGING_INCDIR}/rmc" \ | 19 | -Drmc-includedir="${STAGING_INCDIR}/rmc" \ |
@@ -13,3 +26,5 @@ SRC_URI_append_intel-x86-common = " \ | |||
13 | file://0004-sd-boot-Support-global-kernel-command-line-fragment.patch \ | 26 | file://0004-sd-boot-Support-global-kernel-command-line-fragment.patch \ |
14 | file://0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch \ | 27 | file://0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch \ |
15 | " | 28 | " |
29 | |||
30 | RPROVIDES_${PN} += "rmc-boot" | ||