1
0
mirror of https://github.com/systemd/systemd synced 2026-04-10 17:15:03 +02:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Robert Scheck
7964702007 boot, meson: allow statically linked build
Build option "link-boot-shared" to build a statically linked bootctl and
systemd-bless-boot by using

  -Dlink-boot-shared=false

on systems with full systemd stack except bootctl and systemd-bless-boot,
such as CentOS/RHEL 9.
2021-12-14 09:58:27 +09:00
Davide Cavalca
ba38a24de3 man: do not install sd-boot man pages when -Dgnu-efi=false is set 2021-12-14 00:08:55 +00:00
10 changed files with 27 additions and 17 deletions

View File

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="bootctl" conditional='ENABLE_EFI' <refentry id="bootctl" conditional='HAVE_GNU_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>bootctl</title> <title>bootctl</title>

View File

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="loader.conf" conditional='ENABLE_EFI' <refentry id="loader.conf" conditional='HAVE_GNU_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>loader.conf</title> <title>loader.conf</title>

View File

@ -5,7 +5,7 @@
# ninja -C build update-man-rules # ninja -C build update-man-rules
manpages = [ manpages = [
['binfmt.d', '5', [], 'ENABLE_BINFMT'], ['binfmt.d', '5', [], 'ENABLE_BINFMT'],
['bootctl', '1', [], 'ENABLE_EFI'], ['bootctl', '1', [], 'HAVE_GNU_EFI'],
['bootup', '7', [], ''], ['bootup', '7', [], ''],
['busctl', '1', [], ''], ['busctl', '1', [], ''],
['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'], ['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'],
@ -32,7 +32,7 @@ manpages = [
['kernel-command-line', '7', [], ''], ['kernel-command-line', '7', [], ''],
['kernel-install', '8', [], ''], ['kernel-install', '8', [], ''],
['libudev', '3', [], ''], ['libudev', '3', [], ''],
['loader.conf', '5', [], 'ENABLE_EFI'], ['loader.conf', '5', [], 'HAVE_GNU_EFI'],
['locale.conf', '5', [], ''], ['locale.conf', '5', [], ''],
['localectl', '1', [], 'ENABLE_LOCALED'], ['localectl', '1', [], 'ENABLE_LOCALED'],
['localtime', '5', [], ''], ['localtime', '5', [], ''],
@ -827,14 +827,14 @@ manpages = [
['systemd-ask-password', '1', [], ''], ['systemd-ask-password', '1', [], ''],
['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'], ['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'],
['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'], ['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'],
['systemd-bless-boot-generator', '8', [], 'ENABLE_EFI'], ['systemd-bless-boot-generator', '8', [], 'HAVE_GNU_EFI'],
['systemd-bless-boot.service', '8', ['systemd-bless-boot'], 'ENABLE_EFI'], ['systemd-bless-boot.service', '8', ['systemd-bless-boot'], 'HAVE_GNU_EFI'],
['systemd-boot-check-no-failures.service', ['systemd-boot-check-no-failures.service',
'8', '8',
['systemd-boot-check-no-failures'], ['systemd-boot-check-no-failures'],
''], ''],
['systemd-boot-system-token.service', '8', [], 'ENABLE_EFI'], ['systemd-boot-system-token.service', '8', [], 'HAVE_GNU_EFI'],
['systemd-boot', '7', ['sd-boot'], 'ENABLE_EFI'], ['systemd-boot', '7', ['sd-boot'], 'HAVE_GNU_EFI'],
['systemd-cat', '1', [], ''], ['systemd-cat', '1', [], ''],
['systemd-cgls', '1', [], ''], ['systemd-cgls', '1', [], ''],
['systemd-cgtop', '1', [], ''], ['systemd-cgtop', '1', [], ''],
@ -968,7 +968,7 @@ manpages = [
['systemd-stub', ['systemd-stub',
'7', '7',
['linuxaa64.efi.stub', 'linuxia32.efi.stub', 'linuxx64.efi.stub'], ['linuxaa64.efi.stub', 'linuxia32.efi.stub', 'linuxx64.efi.stub'],
'ENABLE_EFI'], 'HAVE_GNU_EFI'],
['systemd-suspend.service', ['systemd-suspend.service',
'8', '8',
['systemd-hibernate.service', ['systemd-hibernate.service',

View File

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-bless-boot-generator" conditional='ENABLE_EFI'> <refentry id="systemd-bless-boot-generator" conditional='HAVE_GNU_EFI'>
<refentryinfo> <refentryinfo>
<title>systemd-bless-boot-generator</title> <title>systemd-bless-boot-generator</title>

View File

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-bless-boot.service" conditional='ENABLE_EFI' <refentry id="systemd-bless-boot.service" conditional='HAVE_GNU_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>

View File

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-boot-system-token.service" conditional='ENABLE_EFI' <refentry id="systemd-boot-system-token.service" conditional='HAVE_GNU_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>

View File

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-boot" conditional='ENABLE_EFI' <refentry id="systemd-boot" conditional='HAVE_GNU_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>systemd-boot</title> <title>systemd-boot</title>

View File

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-stub" conditional='ENABLE_EFI' <refentry id="systemd-stub" conditional='HAVE_GNU_EFI'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>systemd-stub</title> <title>systemd-stub</title>

View File

@ -2281,11 +2281,17 @@ if conf.get('HAVE_PAM') == 1
endif endif
if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1 if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1
if get_option('link-boot-shared')
boot_link_with = [libshared]
else
boot_link_with = [libsystemd_static, libshared_static]
endif
public_programs += executable( public_programs += executable(
'bootctl', 'bootctl',
'src/boot/bootctl.c', 'src/boot/bootctl.c',
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [boot_link_with],
dependencies : [libblkid], dependencies : [libblkid],
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true) install : true)
@ -2294,7 +2300,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1
'systemd-bless-boot', 'systemd-bless-boot',
'src/boot/bless-boot.c', 'src/boot/bless-boot.c',
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [boot_link_with],
dependencies : [libblkid], dependencies : [libblkid],
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true, install : true,
@ -2304,7 +2310,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1
'systemd-bless-boot-generator', 'systemd-bless-boot-generator',
'src/boot/bless-boot-generator.c', 'src/boot/bless-boot-generator.c',
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [boot_link_with],
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true, install : true,
install_dir : systemgeneratordir) install_dir : systemgeneratordir)
@ -4042,6 +4048,7 @@ foreach tuple : [
['link-systemctl-shared', get_option('link-systemctl-shared')], ['link-systemctl-shared', get_option('link-systemctl-shared')],
['link-networkd-shared', get_option('link-networkd-shared')], ['link-networkd-shared', get_option('link-networkd-shared')],
['link-timesyncd-shared', get_option('link-timesyncd-shared')], ['link-timesyncd-shared', get_option('link-timesyncd-shared')],
['link-boot-shared', get_option('link-boot-shared')],
['fexecve'], ['fexecve'],
['standalone-binaries', get_option('standalone-binaries')], ['standalone-binaries', get_option('standalone-binaries')],
] ]

View File

@ -23,6 +23,9 @@ option('link-networkd-shared', type: 'boolean',
description : 'link systemd-networkd and its helpers to libsystemd-shared.so') description : 'link systemd-networkd and its helpers to libsystemd-shared.so')
option('link-timesyncd-shared', type: 'boolean', option('link-timesyncd-shared', type: 'boolean',
description : 'link systemd-timesyncd and its helpers to libsystemd-shared.so') description : 'link systemd-timesyncd and its helpers to libsystemd-shared.so')
option('link-boot-shared', type: 'boolean',
description : 'link bootctl and systemd-bless-boot against libsystemd-shared.so')
option('static-libsystemd', type : 'combo', option('static-libsystemd', type : 'combo',
choices : ['false', 'true', 'pic', 'no-pic'], choices : ['false', 'true', 'pic', 'no-pic'],
description : '''install a static library for libsystemd''') description : '''install a static library for libsystemd''')