diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-02-26 14:38:58 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-03 15:38:13 +0000 |
commit | 38cdb19deac1fdf21f494c0b61cf4eeaf48491eb (patch) | |
tree | 430281830ea214435390120317b7ebc11d3c4471 /meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch | |
parent | 40bc0ed88062906c310642d4fb958d34d407e98e (diff) | |
download | poky-38cdb19deac1fdf21f494c0b61cf4eeaf48491eb.tar.gz |
systemd-boot: upgrade to 241
The following two patches are added because I cannot figure
out how to pass parameter to efi-cc if it's changed to be
an array value.
systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch
systemd/0001-Revert-meson-use-an-array-option-for-efi-cc.patch
(From OE-Core rev: 42ec27489135f5c2dbe708dacb5dadb0f5d9df5b)
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-Revert-meson-print-EFI-CC-configuration-nicely.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch new file mode 100644 index 0000000000..ed14e25bce --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Revert-meson-print-EFI-CC-configuration-nicely.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 0bf530aac152630500939db31f98d933158fdabd Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Tue, 26 Feb 2019 14:27:49 +0800 | ||
4 | Subject: [PATCH] Revert "meson: print EFI CC configuration nicely" | ||
5 | |||
6 | This reverts commit c512dfb9ac948ddb1ced0dab07b9dac88b198293. | ||
7 | |||
8 | This patch is here because we haven't figured out how to pass | ||
9 | parameter to efi-cc if it's an array in systemd-boot recipe. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE specific] | ||
12 | |||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
14 | --- | ||
15 | meson.build | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index 70fb218..30df834 100644 | ||
20 | --- a/meson.build | ||
21 | +++ b/meson.build | ||
22 | @@ -3138,7 +3138,7 @@ if conf.get('ENABLE_EFI') == 1 | ||
23 | if have_gnu_efi | ||
24 | status += [ | ||
25 | 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), | ||
26 | - 'EFI CC @0@'.format(' '.join(efi_cc)), | ||
27 | + 'EFI CC @0@'.format(efi_cc), | ||
28 | 'EFI lib directory: @0@'.format(efi_libdir), | ||
29 | 'EFI lds directory: @0@'.format(efi_ldsdir), | ||
30 | 'EFI include directory: @0@'.format(efi_incdir)] | ||
31 | -- | ||
32 | 2.7.4 | ||
33 | |||