summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>2019-09-18 16:12:42 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 10:54:32 +0100
commitb59c4277207b5fd5de1440be6258d524b77a1093 (patch)
tree819586f7c1b78c2aaecba89ddc0eedb4a804f122
parentf6fa0f4384de090f6b6f866bdbe0ff2c95395a36 (diff)
downloadpoky-b59c4277207b5fd5de1440be6258d524b77a1093.tar.gz
grub-bootconf: switch to image-uefi.conf
Use variables from image-uefi.conf instead of hardcoding them in the recipe. (From OE-Core rev: b5a97272ba201537a766598d9c9a97c8cbc9ea1d) Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/grub-bootconf_1.00.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
index 9d5dab9aa8..572580313b 100644
--- a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
+++ b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
@@ -9,6 +9,8 @@ RPROVIDES_${PN} += "virtual/grub-bootconf"
9 9
10inherit grub-efi-cfg 10inherit grub-efi-cfg
11 11
12require conf/image-uefi.conf
13
12S = "${WORKDIR}" 14S = "${WORKDIR}"
13 15
14GRUB_CFG = "${S}/grub-bootconf" 16GRUB_CFG = "${S}/grub-bootconf"
@@ -23,10 +25,8 @@ python do_configure() {
23do_configure[vardeps] += "APPEND ROOT" 25do_configure[vardeps] += "APPEND ROOT"
24 26
25do_install() { 27do_install() {
26 install -d ${D}/boot 28 install -d ${D}${EFI_FILES_PATH}
27 install -d ${D}/boot/EFI 29 install grub-bootconf ${D}${EFI_FILES_PATH}/grub.cfg
28 install -d ${D}/boot/EFI/BOOT
29 install grub-bootconf ${D}/boot/EFI/BOOT/grub.cfg
30} 30}
31 31
32FILES_${PN} = "/boot/EFI/BOOT/grub.cfg" 32FILES_${PN} = "${EFI_FILES_PATH}/grub.cfg"