diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-03-07 10:28:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:30:19 +0000 |
commit | 086308aa2a5e332de6f00ed397c4a55d132f158f (patch) | |
tree | 4b337544ef9839578f78da767eb9250d5976096b /meta/recipes-core/systemd/systemd | |
parent | 4871d3c2b6dd6c07a2adcfbc9ecfb22e4afa2d0d (diff) | |
download | openembedded-core-contrib-086308aa2a5e332de6f00ed397c4a55d132f158f.tar.gz |
systemd-boot: upgrade to 237
Upgrade systemd-boot to 237.
As systemd has dropped autotools support, fix configure and compile
failures related to meson.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
2 files changed, 90 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch b/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch new file mode 100644 index 0000000000..877bb1c65c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch @@ -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 + diff --git a/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch new file mode 100644 index 0000000000..e2e19ba068 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch @@ -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 + |