mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

grub-efi: install to /boot/

Browse Source 
Since /boot/ will be recipe/package controlled now we can't just deploy.

(From OE-Core rev: f9c3405a99f3c0fd922d21bea7bb0bd0dd3a2ab2)

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
California Sullivan
2018-02-28 18:15:00 -08:00
committed by Richard Purdie
parent 067ef24d2e
commit 531f7b4445
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/grub/grub-bootconf_1.00.bb
+1 -1
View File
@@ -23,7 +23,7 @@ do_install() {
install -d ${D}/boot install -d ${D}/boot
install -d ${D}/boot/EFI install -d ${D}/boot/EFI
install -d ${D}/boot/EFI/BOOT 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" FILES_${PN} = "/boot/EFI/BOOT/grub.cfg"
meta/recipes-bsp/grub/grub-efi_2.02.bb
+27 -7
View File
@@ -3,7 +3,7 @@ require grub2.inc
GRUBPLATFORM = "efi" GRUBPLATFORM = "efi"
DEPENDS_append_class-target = " grub-efi-native" 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 += " \ SRC_URI += " \
file://cfg \ 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) # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo)
CFLAGS_append_class-native = " -Wno-error=trampolines" 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() { do_install_class-native() {
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 755 grub-mkimage ${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" efi_gop iso9660 configfile search loadenv test"
do_deploy() { 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} install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR}
} }
@@ -72,7 +89,10 @@ do_deploy_class-native() {
addtask deploy after do_install before do_build addtask deploy after do_install before do_build
FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ 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 # 64-bit binaries are expected for the bootloader with an x32 userland
INSANE_SKIP_${PN}_append_linux-gnux32 = " arch" INSANE_SKIP_${PN}_append_linux-gnux32 = " arch"