diff options
| author | California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:11 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:23:06 -0800 |
| commit | 551925bc49707821d0d621369fd33fde6b836d8c (patch) | |
| tree | d2e6826be01ab89717fbb4fd0519f1def5308d08 | |
| parent | cceb4266f3e70382e171c3a338c10d9730c9dc3f (diff) | |
| download | openembedded-core-551925bc49707821d0d621369fd33fde6b836d8c.tar.gz openembedded-core-551925bc49707821d0d621369fd33fde6b836d8c.tar.bz2 openembedded-core-551925bc49707821d0d621369fd33fde6b836d8c.zip | |
systemd-boot: add package that installs to boot
If the EFI_PROVIDER is systemd-boot, install as boot(x64|ia32) as per
convention. If its not the EFI_PROVIDER, install as
systemd-boot(x64|ia32), as to not collide with other possible
bootloaders.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd-boot_234.bb | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_234.bb b/meta/recipes-core/systemd/systemd-boot_234.bb index 88a14ac61e..2d29df8be7 100644 --- a/meta/recipes-core/systemd/systemd-boot_234.bb +++ b/meta/recipes-core/systemd/systemd-boot_234.bb @@ -18,6 +18,26 @@ EXTRA_OECONF = " --enable-gnuefi \ EFI_CC='${EFI_CC}' \ " +# install to the image as boot*.efi if its the EFI_PROVIDER, +# otherwise install as the full name. +# This allows multiple bootloaders to coexist in a single image. +python __anonymous () { + import re + target = d.getVar('TARGET_ARCH') + prefix = "" if d.getVar('EFI_PROVIDER', True) == "systemd-boot" else "systemd-" + if target == "x86_64": + systemdimage = prefix + "bootx64.efi" + else: + systemdimage = prefix + "bootia32.efi" + d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) + prefix = "systemd-" if prefix == "" else "" + d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) +} + +FILES_${PN} = "/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}" + +RDEPENDS_${PN} += "virtual/systemd-bootconf" + # Imported from the old gummiboot recipe TUNE_CCARGS_remove = "-mfpmath=sse" COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" @@ -29,12 +49,14 @@ do_compile() { SYSTEMD_BOOT_EFI_ARCH="x64" fi - oe_runmake systemd-boot${SYSTEMD_BOOT_EFI_ARCH}.efi + oe_runmake ${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} } do_install() { - # Bypass systemd installation with a NOP - : + install -d ${D}/boot + install -d ${D}/boot/EFI + install -d ${D}/boot/EFI/BOOT + install ${B}/systemd-boot*.efi ${D}/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE} } do_deploy () { |