1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00

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 65dcf9f9a0)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-12-23 12:55:40 +01:00 committed by Luca Boccassi
parent 1b003bbc80
commit 02482cb698

View File

@ -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