mirror of
https://github.com/systemd/systemd
synced 2026-04-10 17:15:03 +02:00
Compare commits
2 Commits
17cfd6f96f
...
7964702007
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7964702007 | ||
|
|
ba38a24de3 |
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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">
|
||||
<refentryinfo>
|
||||
<title>bootctl</title>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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">
|
||||
<refentryinfo>
|
||||
<title>loader.conf</title>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# ninja -C build update-man-rules
|
||||
manpages = [
|
||||
['binfmt.d', '5', [], 'ENABLE_BINFMT'],
|
||||
['bootctl', '1', [], 'ENABLE_EFI'],
|
||||
['bootctl', '1', [], 'HAVE_GNU_EFI'],
|
||||
['bootup', '7', [], ''],
|
||||
['busctl', '1', [], ''],
|
||||
['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'],
|
||||
@ -32,7 +32,7 @@ manpages = [
|
||||
['kernel-command-line', '7', [], ''],
|
||||
['kernel-install', '8', [], ''],
|
||||
['libudev', '3', [], ''],
|
||||
['loader.conf', '5', [], 'ENABLE_EFI'],
|
||||
['loader.conf', '5', [], 'HAVE_GNU_EFI'],
|
||||
['locale.conf', '5', [], ''],
|
||||
['localectl', '1', [], 'ENABLE_LOCALED'],
|
||||
['localtime', '5', [], ''],
|
||||
@ -827,14 +827,14 @@ manpages = [
|
||||
['systemd-ask-password', '1', [], ''],
|
||||
['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'],
|
||||
['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'],
|
||||
['systemd-bless-boot-generator', '8', [], 'ENABLE_EFI'],
|
||||
['systemd-bless-boot.service', '8', ['systemd-bless-boot'], 'ENABLE_EFI'],
|
||||
['systemd-bless-boot-generator', '8', [], 'HAVE_GNU_EFI'],
|
||||
['systemd-bless-boot.service', '8', ['systemd-bless-boot'], 'HAVE_GNU_EFI'],
|
||||
['systemd-boot-check-no-failures.service',
|
||||
'8',
|
||||
['systemd-boot-check-no-failures'],
|
||||
''],
|
||||
['systemd-boot-system-token.service', '8', [], 'ENABLE_EFI'],
|
||||
['systemd-boot', '7', ['sd-boot'], 'ENABLE_EFI'],
|
||||
['systemd-boot-system-token.service', '8', [], 'HAVE_GNU_EFI'],
|
||||
['systemd-boot', '7', ['sd-boot'], 'HAVE_GNU_EFI'],
|
||||
['systemd-cat', '1', [], ''],
|
||||
['systemd-cgls', '1', [], ''],
|
||||
['systemd-cgtop', '1', [], ''],
|
||||
@ -968,7 +968,7 @@ manpages = [
|
||||
['systemd-stub',
|
||||
'7',
|
||||
['linuxaa64.efi.stub', 'linuxia32.efi.stub', 'linuxx64.efi.stub'],
|
||||
'ENABLE_EFI'],
|
||||
'HAVE_GNU_EFI'],
|
||||
['systemd-suspend.service',
|
||||
'8',
|
||||
['systemd-hibernate.service',
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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>
|
||||
<title>systemd-bless-boot-generator</title>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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">
|
||||
|
||||
<refentryinfo>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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">
|
||||
|
||||
<refentryinfo>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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">
|
||||
<refentryinfo>
|
||||
<title>systemd-boot</title>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
<!-- 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">
|
||||
<refentryinfo>
|
||||
<title>systemd-stub</title>
|
||||
|
||||
13
meson.build
13
meson.build
@ -2281,11 +2281,17 @@ if conf.get('HAVE_PAM') == 1
|
||||
endif
|
||||
|
||||
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(
|
||||
'bootctl',
|
||||
'src/boot/bootctl.c',
|
||||
include_directories : includes,
|
||||
link_with : [libshared],
|
||||
link_with : [boot_link_with],
|
||||
dependencies : [libblkid],
|
||||
install_rpath : rootlibexecdir,
|
||||
install : true)
|
||||
@ -2294,7 +2300,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1
|
||||
'systemd-bless-boot',
|
||||
'src/boot/bless-boot.c',
|
||||
include_directories : includes,
|
||||
link_with : [libshared],
|
||||
link_with : [boot_link_with],
|
||||
dependencies : [libblkid],
|
||||
install_rpath : rootlibexecdir,
|
||||
install : true,
|
||||
@ -2304,7 +2310,7 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1
|
||||
'systemd-bless-boot-generator',
|
||||
'src/boot/bless-boot-generator.c',
|
||||
include_directories : includes,
|
||||
link_with : [libshared],
|
||||
link_with : [boot_link_with],
|
||||
install_rpath : rootlibexecdir,
|
||||
install : true,
|
||||
install_dir : systemgeneratordir)
|
||||
@ -4042,6 +4048,7 @@ foreach tuple : [
|
||||
['link-systemctl-shared', get_option('link-systemctl-shared')],
|
||||
['link-networkd-shared', get_option('link-networkd-shared')],
|
||||
['link-timesyncd-shared', get_option('link-timesyncd-shared')],
|
||||
['link-boot-shared', get_option('link-boot-shared')],
|
||||
['fexecve'],
|
||||
['standalone-binaries', get_option('standalone-binaries')],
|
||||
]
|
||||
|
||||
@ -23,6 +23,9 @@ option('link-networkd-shared', type: 'boolean',
|
||||
description : 'link systemd-networkd and its helpers to libsystemd-shared.so')
|
||||
option('link-timesyncd-shared', type: 'boolean',
|
||||
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',
|
||||
choices : ['false', 'true', 'pic', 'no-pic'],
|
||||
description : '''install a static library for libsystemd''')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user