summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-07-17 02:05:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 09:18:42 (GMT)
commitb0f2f690a3513e4c9fa30fee1b8d7ac2d7140657 (patch)
treec3d5512f0d5832c125b82f01d58b04c023b0973f
parentada8a5d9175b141b4fe532f542f5c1f7ffa26d88 (diff)
downloadpoky-b0f2f690a3513e4c9fa30fee1b8d7ac2d7140657.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>
-rw-r--r--meta/recipes-core/systemd/systemd-boot_239.bb (renamed from meta/recipes-core/systemd/systemd-boot_237.bb)5
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch28
2 files changed, 2 insertions, 31 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_237.bb b/meta/recipes-core/systemd/systemd-boot_239.bb
index afd3848..7fe420c 100644
--- a/meta/recipes-core/systemd/systemd-boot_237.bb
+++ b/meta/recipes-core/systemd/systemd-boot_239.bb
@@ -3,9 +3,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
3 3
4DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" 4DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
5 5
6SRC_URI += "file://0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ 6SRC_URI += "file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
7 file://0027-remove-nobody-user-group-checking.patch \ 7 file://0006-remove-nobody-user-group-checking.patch \
8 file://0001-Also-check-i386-i586-and-i686-for-ia32.patch \
9 file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ 8 file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \
10 " 9 "
11 10
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 877bb1c..0000000
--- a/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 3e8c19bb1bbc4493c591f75c00c1fefe3b1c8a69 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 27 Feb 2018 20:42:41 -0800
4Subject: [PATCH] Also check i386, i586 and i686 for ia32
5
6Upstream-Status: Pending
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 meson.build | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/meson.build b/meson.build
14index 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--
272.13.0
28