diff options
author | Ross Burton <ross@burtonini.com> | 2020-12-14 18:31:46 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-18 22:52:24 +0000 |
commit | 118f3a24f2f8570be80b58374ce02e44c871f24d (patch) | |
tree | 9b396a4511926fe1484153842cebd39efb77fe74 /meta/recipes-core/systemd | |
parent | df50c8308b58d4ee8e9aea523f92ae7512ef0e77 (diff) | |
download | poky-118f3a24f2f8570be80b58374ce02e44c871f24d.tar.gz |
systemd-boot: build the EFI stub
Also build and deploy the EFI stub. SYSTEMD_BOOT_EFI_ARCH can be dropped
as image-uefi.conf now sets EFI_ARCH.
Changes originally taken from meta-intel.
(From OE-Core rev: 00191504bd9321334a5c01b95179ed15b063f1b6)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd-boot_246.6.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_246.6.bb b/meta/recipes-core/systemd/systemd-boot_246.6.bb index f92c639810..97093e4bb2 100644 --- a/meta/recipes-core/systemd/systemd-boot_246.6.bb +++ b/meta/recipes-core/systemd/systemd-boot_246.6.bb | |||
@@ -47,16 +47,14 @@ RDEPENDS_${PN} += "virtual/systemd-bootconf" | |||
47 | 47 | ||
48 | # Imported from the old gummiboot recipe | 48 | # Imported from the old gummiboot recipe |
49 | TUNE_CCARGS_remove = "-mfpmath=sse" | 49 | TUNE_CCARGS_remove = "-mfpmath=sse" |
50 | |||
50 | COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" | 51 | COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" |
51 | COMPATIBLE_HOST_x86-x32 = "null" | 52 | COMPATIBLE_HOST_x86-x32 = "null" |
52 | 53 | ||
53 | do_compile() { | 54 | do_compile() { |
54 | SYSTEMD_BOOT_EFI_ARCH="ia32" | 55 | ninja \ |
55 | if [ "${TARGET_ARCH}" = "x86_64" ]; then | 56 | src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} \ |
56 | SYSTEMD_BOOT_EFI_ARCH="x64" | 57 | src/boot/efi/linux${EFI_ARCH}.efi.stub |
57 | fi | ||
58 | |||
59 | ninja src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE} | ||
60 | } | 58 | } |
61 | 59 | ||
62 | do_install() { | 60 | do_install() { |
@@ -66,5 +64,7 @@ do_install() { | |||
66 | 64 | ||
67 | do_deploy () { | 65 | do_deploy () { |
68 | install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR} | 66 | install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR} |
67 | install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR} | ||
69 | } | 68 | } |
69 | |||
70 | addtask deploy before do_build after do_compile | 70 | addtask deploy before do_build after do_compile |