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:59:33 +0000 |
commit | f49ee61422c867516db252054e993df29f775136 (patch) | |
tree | efac1a51a35f87a023c43d61d762d993114a2209 /meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch | |
parent | aacaf836ba7d53590ea9a3bd76bab16d02c9ffbb (diff) | |
download | poky-8295aebb020917845eeb37e3fa2feed3f377c14b.tar.gz |
systemd-boot: upgrade to 2372.5_M3
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>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch | 28 |
1 files changed, 28 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 @@ | |||
1 | From 3e8c19bb1bbc4493c591f75c00c1fefe3b1c8a69 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Tue, 27 Feb 2018 20:42:41 -0800 | ||
4 | Subject: [PATCH] Also check i386, i586 and i686 for ia32 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | meson.build | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 28cb8b60e..489531a43 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -1217,7 +1217,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests) | ||
18 | if get_option('efi') | ||
19 | efi_arch = host_machine.cpu_family() | ||
20 | |||
21 | - if efi_arch == 'x86' | ||
22 | + if efi_arch == 'x86' or efi_arch == 'i386' or efi_arch == 'i586' or efi_arch == 'i686' | ||
23 | EFI_MACHINE_TYPE_NAME = 'ia32' | ||
24 | gnu_efi_arch = 'ia32' | ||
25 | elif efi_arch == 'x86_64' | ||
26 | -- | ||
27 | 2.13.0 | ||
28 | |||