diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-07-17 10:05:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-18 10:18:42 +0100 |
commit | b0f2f690a3513e4c9fa30fee1b8d7ac2d7140657 (patch) | |
tree | c3d5512f0d5832c125b82f01d58b04c023b0973f /meta/recipes-core/systemd/systemd | |
parent | ada8a5d9175b141b4fe532f542f5c1f7ffa26d88 (diff) | |
download | poky-2.6_M2.tar.gz |
systemd-boot: upgrade to 2392.6_M2
Upgrade systemd-boot to 239.
The following patch is removed due to recent fix about meson's cpu family
mapping and validation.
0001-Also-check-i386-i586-and-i686-for-ia32.patch
(From OE-Core rev: ff0b682b807959521c85716296de7a1d26d7d18f)
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')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch | 28 |
1 files changed, 0 insertions, 28 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 deleted file mode 100644 index 877bb1c65c..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
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 | |||