summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>2019-09-18 13:12:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 09:54:32 (GMT)
commit6501eacfa2b23817f6268ec3dd69da7dd3411ca3 (patch)
treec9e62dc3590639b3c355163cbbbfc28cdd8f85dc /meta/recipes-core
parenta1acf2c150f96346187797bee25f1694f3721919 (diff)
downloadpoky-6501eacfa2b23817f6268ec3dd69da7dd3411ca3.tar.gz
systemd-boot: switch to image-uefi.conf
Use variables from image-uefi.conf instead of hardcoding them in the recipe. (From OE-Core rev: 4acac3560cb819e0cd992e02441621dab1beada7) Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd-boot_243.bb15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_243.bb b/meta/recipes-core/systemd/systemd-boot_243.bb
index 56a25c3..515abc2 100644
--- a/meta/recipes-core/systemd/systemd-boot_243.bb
+++ b/meta/recipes-core/systemd/systemd-boot_243.bb
@@ -1,6 +1,8 @@
1require systemd.inc 1require systemd.inc
2FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" 2FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
3 3
4require conf/image-uefi.conf
5
4DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" 6DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
5 7
6# NOTE: These three patches are in theory not needed, but we haven't 8# NOTE: These three patches are in theory not needed, but we haven't
@@ -33,16 +35,13 @@ python __anonymous () {
33 import re 35 import re
34 target = d.getVar('TARGET_ARCH') 36 target = d.getVar('TARGET_ARCH')
35 prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-" 37 prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-"
36 if target == "x86_64": 38 systemdimage = prefix + d.getVar("EFI_BOOT_IMAGE")
37 systemdimage = prefix + "bootx64.efi"
38 else:
39 systemdimage = prefix + "bootia32.efi"
40 d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage) 39 d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage)
41 prefix = "systemd-" if prefix == "" else "" 40 prefix = "systemd-" if prefix == "" else ""
42 d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) 41 d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix)
43} 42}
44 43
45FILES_${PN} = "/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}" 44FILES_${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
46 45
47RDEPENDS_${PN} += "virtual/systemd-bootconf" 46RDEPENDS_${PN} += "virtual/systemd-bootconf"
48 47
@@ -61,10 +60,8 @@ do_compile() {
61} 60}
62 61
63do_install() { 62do_install() {
64 install -d ${D}/boot 63 install -d ${D}${EFI_FILES_PATH}
65 install -d ${D}/boot/EFI 64 install ${B}/src/boot/efi/systemd-boot*.efi ${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}
66 install -d ${D}/boot/EFI/BOOT
67 install ${B}/src/boot/efi/systemd-boot*.efi ${D}/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}
68} 65}
69 66
70do_deploy () { 67do_deploy () {