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

systemd-boot: upgrade to 237

Browse Source 
Upgrade systemd-boot to 237.

As systemd has dropped autotools support, fix configure and compile
failures related to meson.

(From OE-Core rev: 086308aa2a5e332de6f00ed397c4a55d132f158f)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi
2018-03-07 10:28:36 +08:00
committed by Richard Purdie
parent aacaf836ba
commit f49ee61422
3 changed files with 108 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd-boot_234.bb → meta/recipes-core/systemd/systemd-boot_237.bb
+18 -13
View File
@@ -3,20 +3,25 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
SRC_URI += "file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch"
SRC_URI += "file://0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
file://0027-remove-nobody-user-group-checking.patch \
file://0001-Also-check-i386-i586-and-i686-for-ia32.patch \
file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \
"
inherit autotools pkgconfig gettext
inherit meson pkgconfig gettext
inherit deploy
EFI_CC ?= "${CC}"
# Man pages are packaged through the main systemd recipe
EXTRA_OECONF = " --enable-gnuefi \
--with-efi-includedir=${STAGING_INCDIR} \
--with-efi-ldsdir=${STAGING_LIBDIR} \
--with-efi-libdir=${STAGING_LIBDIR} \
--disable-manpages \
EFI_CC='${EFI_CC}' \
"
EXTRA_OEMESON += "-Defi=true \
-Dgnu-efi=true \
-Defi-includedir=${STAGING_INCDIR}/efi \
-Defi-ldsdir=${STAGING_LIBDIR} \
-Defi-libdir=${STAGING_LIBDIR} \
-Dman=false \
-Defi-cc='${EFI_CC}' \
-Defi-ld='${LD}' \
"
# install to the image as boot*.efi if its the EFI_PROVIDER,
# otherwise install as the full name.
@@ -49,17 +54,17 @@ do_compile() {
SYSTEMD_BOOT_EFI_ARCH="x64"
fi
oe_runmake ${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE}
ninja src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE}
}
do_install() {
install -d ${D}/boot
install -d ${D}/boot/EFI
install -d ${D}/boot/EFI/BOOT
install ${B}/systemd-boot*.efi ${D}/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}
install ${B}/src/boot/efi/systemd-boot*.efi ${D}/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}
}
do_deploy () {
install ${B}/systemd-boot*.efi ${DEPLOYDIR}
install ${B}/src/boot/efi/systemd-boot*.efi ${DEPLOYDIR}
}
addtask deploy before do_build after do_compile
meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
+28
View File
@@ -0,0 +1,28 @@
From 3e8c19bb1bbc4493c591f75c00c1fefe3b1c8a69 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 27 Feb 2018 20:42:41 -0800
Subject: [PATCH] Also check i386, i586 and i686 for ia32
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 28cb8b60e..489531a43 100644
--- a/meson.build
+++ b/meson.build
@@ -1217,7 +1217,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
if get_option('efi')
efi_arch = host_machine.cpu_family()
- if efi_arch == 'x86'
+ if efi_arch == 'x86' or efi_arch == 'i386' or efi_arch == 'i586' or efi_arch == 'i686'
EFI_MACHINE_TYPE_NAME = 'ia32'
gnu_efi_arch = 'ia32'
elif efi_arch == 'x86_64'
--
2.13.0
meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
+62
View File
@@ -0,0 +1,62 @@
From 527413ec243564a89ffaad6368d446de44415970 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Tue, 27 Feb 2018 21:42:23 -0800
Subject: [PATCH] Fix to run efi_cc and efi_ld correctly when cross-compiling
When cross-compiling, efi_cc and efi_ld may take the form of
'xxx-gcc --sysroot=xxx', and this would cause run_command and
the alike fail.
Fix to split them to make commands run correctly.
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
src/boot/efi/meson.build | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 992a3ba4c..9f9ec4911 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -157,7 +157,7 @@ if have_gnu_efi
o_file = custom_target(file + '.o',
input : file,
output : file + '.o',
- command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@']
+ command : efi_cc.split() + ['-c', '@INPUT@', '-o', '@OUTPUT@']
+ compile_args,
depend_files : efi_headers)
if (common_sources + systemd_boot_sources).contains(file)
@@ -168,7 +168,17 @@ if have_gnu_efi
endif
endforeach
- libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip()
+ find_libgcc_cmd_all = efi_cc + ' -print-libgcc-file-name'
+ find_libgcc_cmd = find_libgcc_cmd_all.split()[0]
+ find_libgcc_args = []
+ cmd_args_all = find_libgcc_cmd_all.split()
+ foreach arg : cmd_args_all
+ if arg != find_libgcc_cmd
+ find_libgcc_args += arg
+ endif
+ endforeach
+
+ libgcc_file_name = run_command(find_libgcc_cmd, find_libgcc_args).stdout().strip()
systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME)
stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME)
no_undefined_symbols = find_program('no-undefined-symbols.sh')
@@ -179,7 +189,7 @@ if have_gnu_efi
tuple[0],
input : tuple[2],
output : tuple[0],
- command : [efi_ld, '-o', '@OUTPUT@'] +
+ command : efi_ld.split() + ['-o', '@OUTPUT@'] +
efi_ldflags + tuple[2] +
['-lefi', '-lgnuefi', libgcc_file_name])
--
2.13.0