diff options
| author |   California Sullivan <california.l.sullivan@intel.com> | 2018-02-28 18:15:00 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-06 06:23:06 -0800 |
| commit | f9c3405a99f3c0fd922d21bea7bb0bd0dd3a2ab2 (patch) | |
| tree | d2be6809b97c95e23b566df2c6ec5fdfab67b937 /meta/recipes-bsp | |
| parent | eff14ba3e49d77bfc8167a19a0f58563270f2a51 (diff) | |
| download | openembedded-core-contrib-f9c3405a99f3c0fd922d21bea7bb0bd0dd3a2ab2.tar.gz | |
grub-efi: install to /boot/
Since /boot/ will be recipe/package controlled now we can't just deploy.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
| -rw-r--r-- | meta/recipes-bsp/grub/grub-bootconf_1.00.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.02.bb | 34 |
2 files changed, 28 insertions, 8 deletions
diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb index d376fde68b1..750f8c808a8 100644 --- a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb +++ b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb @@ -23,7 +23,7 @@ do_install() { install -d ${D}/boot install -d ${D}/boot/EFI install -d ${D}/boot/EFI/BOOT - install -m 0744 grub-bootconf ${D}/boot/EFI/BOOT/grub.cfg + install grub-bootconf ${D}/boot/EFI/BOOT/grub.cfg } FILES_${PN} = "/boot/EFI/BOOT/grub.cfg" diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb b/meta/recipes-bsp/grub/grub-efi_2.02.bb index d5aa64c75f7..c5a68f01cef 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.02.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb @@ -3,7 +3,7 @@ require grub2.inc GRUBPLATFORM = "efi" DEPENDS_append_class-target = " grub-efi-native" -RDEPENDS_${PN}_class-target = "diffutils freetype grub-common" +RDEPENDS_${PN}_class-target = "diffutils freetype grub-common virtual/grub-bootconf" SRC_URI += " \ file://cfg \ @@ -36,6 +36,28 @@ EXTRA_OECONF += "--enable-efiemu=no" # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo) CFLAGS_append_class-native = " -Wno-error=trampolines" +do_mkimage() { + cd ${B} + # Search for the grub.cfg on the local boot media by using the + # built in cfg file provided via this recipe + grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ + -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ + ${GRUB_BUILDIN} +} + +addtask mkimage before do_install after do_compile + +do_mkimage_class-native() { + : +} + +do_install_append_class-target() { + install -d ${D}/boot + install -d ${D}/boot/EFI + install -d ${D}/boot/EFI/BOOT + install -m 644 ${B}/${GRUB_IMAGE} ${D}/boot/EFI/BOOT/ +} + do_install_class-native() { install -d ${D}${bindir} install -m 755 grub-mkimage ${D}${bindir} @@ -57,11 +79,6 @@ GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \ efi_gop iso9660 configfile search loadenv test" do_deploy() { - # Search for the grub.cfg on the local boot media by using the - # built in cfg file provided via this recipe - grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ - -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ - ${GRUB_BUILDIN} install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR} } @@ -72,7 +89,10 @@ do_deploy_class-native() { addtask deploy after do_install before do_build FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ - " + ${datadir}/grub \ + /boot/EFI/BOOT/${GRUB_IMAGE} \ + " + # 64-bit binaries are expected for the bootloader with an x32 userland INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" |