You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
137 lines
3.1 KiB
137 lines
3.1 KiB
From 9cfc2fd3c58609252b3fd203af95bec1aab1b832 Mon Sep 17 00:00:00 2001 |
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> |
|
Date: Thu, 23 Dec 2021 12:55:40 +0100 |
|
Subject: [PATCH] meson: move efi file lists closer to where they are used |
|
|
|
The goal is to have the detection of features and paths done first, and |
|
then the build target constructions second. |
|
|
|
(cherry picked from commit 65dcf9f9a0d877de0dc53558547462a7f1750c78) |
|
|
|
Related: #2017035 |
|
--- |
|
src/boot/efi/meson.build | 104 +++++++++++++++++++-------------------- |
|
1 file changed, 51 insertions(+), 53 deletions(-) |
|
|
|
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build |
|
index e10e51cf4e..1125c64ea3 100644 |
|
--- a/src/boot/efi/meson.build |
|
+++ b/src/boot/efi/meson.build |
|
@@ -99,59 +99,6 @@ if efi_lds == '' |
|
subdir_done() |
|
endif |
|
|
|
-efi_headers = files(''' |
|
- bcd.h |
|
- console.h |
|
- cpio.h |
|
- devicetree.h |
|
- disk.h |
|
- drivers.h |
|
- graphics.h |
|
- linux.h |
|
- measure.h |
|
- missing_efi.h |
|
- pe.h |
|
- random-seed.h |
|
- shim.h |
|
- splash.h |
|
- util.h |
|
- xbootldr.h |
|
-'''.split()) |
|
- |
|
-common_sources = ''' |
|
- assert.c |
|
- devicetree.c |
|
- disk.c |
|
- graphics.c |
|
- measure.c |
|
- pe.c |
|
- secure-boot.c |
|
- util.c |
|
-'''.split() |
|
- |
|
-systemd_boot_sources = ''' |
|
- bcd.c |
|
- boot.c |
|
- console.c |
|
- drivers.c |
|
- random-seed.c |
|
- shim.c |
|
- xbootldr.c |
|
-'''.split() |
|
- |
|
-stub_sources = ''' |
|
- cpio.c |
|
- initrd.c |
|
- splash.c |
|
- stub.c |
|
-'''.split() |
|
- |
|
-if efi_arch[1] in ['ia32', 'x86_64'] |
|
- stub_sources += 'linux_x86.c' |
|
-else |
|
- stub_sources += 'linux.c' |
|
-endif |
|
- |
|
conf.set10('HAVE_GNU_EFI', true) |
|
conf.set_quoted('EFI_MACHINE_TYPE_NAME', efi_arch[0]) |
|
|
|
@@ -332,6 +279,57 @@ if efi_cc_version.contains('clang') and efi_cc_version.split('.')[0].split(' ')[ |
|
efi_ldflags += ['-Wl,-T,' + efi_lds, '-Wno-unused-command-line-argument'] |
|
endif |
|
|
|
+############################################################ |
|
+ |
|
+efi_headers = files( |
|
+ 'bcd.h', |
|
+ 'console.h', |
|
+ 'cpio.h', |
|
+ 'devicetree.h', |
|
+ 'disk.h', |
|
+ 'drivers.h', |
|
+ 'graphics.h', |
|
+ 'linux.h', |
|
+ 'measure.h', |
|
+ 'missing_efi.h', |
|
+ 'pe.h', |
|
+ 'random-seed.h', |
|
+ 'shim.h', |
|
+ 'splash.h', |
|
+ 'util.h', |
|
+ 'xbootldr.h') |
|
+ |
|
+common_sources = [ |
|
+ 'assert.c', |
|
+ 'devicetree.c', |
|
+ 'disk.c', |
|
+ 'graphics.c', |
|
+ 'measure.c', |
|
+ 'pe.c', |
|
+ 'secure-boot.c', |
|
+ 'util.c'] |
|
+ |
|
+systemd_boot_sources = [ |
|
+ 'bcd.c', |
|
+ 'boot.c', |
|
+ 'console.c', |
|
+ 'drivers.c', |
|
+ 'random-seed.c', |
|
+ 'shim.c', |
|
+ 'xbootldr.c'] |
|
+ |
|
+stub_sources = [ |
|
+ 'cpio.c', |
|
+ 'initrd.c', |
|
+ 'splash.c', |
|
+ 'stub.c'] |
|
+ |
|
+if efi_arch[1] in ['ia32', 'x86_64'] |
|
+ stub_sources += 'linux_x86.c' |
|
+else |
|
+ stub_sources += 'linux.c' |
|
+endif |
|
+ |
|
systemd_boot_objects = [] |
|
stub_objects = [] |
|
foreach file : fundamental_source_paths + common_sources + systemd_boot_sources + stub_sources
|
|
|