diff options
Diffstat (limited to 'recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch')
-rw-r--r-- | recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch b/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch deleted file mode 100644 index a3e496f5..00000000 --- a/recipes-bsp/systemd-boot/systemd-boot/0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From af977853ab722194c4754e6693f430f50a42190f Mon Sep 17 00:00:00 2001 | ||
2 | From: California Sullivan <california.l.sullivan@intel.com> | ||
3 | Date: Tue, 20 Mar 2018 10:08:14 -0700 | ||
4 | Subject: [PATCH 2/5] sd-boot: fix RMC compatibility with systemd-boot and | ||
5 | meson | ||
6 | |||
7 | With autotools swapped out for meson a number of things need to be | ||
8 | changed. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | ||
13 | --- | ||
14 | meson_options.txt | 2 ++ | ||
15 | src/boot/efi/meson.build | 4 +++- | ||
16 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/meson_options.txt b/meson_options.txt | ||
19 | index 39822d6cd..d8a480401 100644 | ||
20 | --- a/meson_options.txt | ||
21 | +++ b/meson_options.txt | ||
22 | @@ -279,6 +279,8 @@ option('efi-ldsdir', type : 'string', | ||
23 | description : 'path to the EFI lds directory') | ||
24 | option('efi-includedir', type : 'string', value : '/usr/include/efi', | ||
25 | description : 'path to the EFI header directory') | ||
26 | +option('rmc-includedir', type : 'string', value : '/usr/include/rmc', | ||
27 | + description : 'path to the RMC header directory') | ||
28 | option('tpm-pcrindex', type : 'string', value : '8', | ||
29 | description : 'TPM PCR register number to use') | ||
30 | |||
31 | diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build | ||
32 | index 9f9ec4911..266ff928f 100644 | ||
33 | --- a/src/boot/efi/meson.build | ||
34 | +++ b/src/boot/efi/meson.build | ||
35 | @@ -83,6 +83,7 @@ if have_gnu_efi | ||
36 | efi_conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) | ||
37 | efi_conf.set10('ENABLE_TPM', get_option('tpm')) | ||
38 | efi_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex')) | ||
39 | + efi_conf.set('RMC_EFI', 'true') | ||
40 | |||
41 | efi_config_h = configure_file( | ||
42 | output : 'efi_config.h', | ||
43 | @@ -121,6 +122,7 @@ if have_gnu_efi | ||
44 | '-Wsign-compare', | ||
45 | '-Wno-missing-field-initializers', | ||
46 | '-isystem', efi_incdir, | ||
47 | + '-isystem', get_option('rmc-includedir'), | ||
48 | '-isystem', join_paths(efi_incdir, gnu_efi_arch), | ||
49 | '-include', efi_config_h] | ||
50 | if efi_arch == 'x86_64' | ||
51 | @@ -191,7 +193,7 @@ if have_gnu_efi | ||
52 | output : tuple[0], | ||
53 | command : efi_ld.split() + ['-o', '@OUTPUT@'] + | ||
54 | efi_ldflags + tuple[2] + | ||
55 | - ['-lefi', '-lgnuefi', libgcc_file_name]) | ||
56 | + ['-lefi', '-lgnuefi', '-lrmcefi', libgcc_file_name]) | ||
57 | |||
58 | test('no-undefined-symbols-' + tuple[0], | ||
59 | no_undefined_symbols, | ||
60 | -- | ||
61 | 2.14.3 | ||
62 | |||