aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06/systemd.xml
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06/systemd.xml')
-rw-r--r--chapter06/systemd.xml62
1 files changed, 20 insertions, 42 deletions
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 84a66466e..923b7a36f 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -46,29 +46,26 @@
<para>Prepare systemd for compilation:</para>
-<screen><userinput remap="configure">PKG_CONFIG_PATH=/usr/lib/pkgconfig:/tools/lib/pkgconfig \
-LANG=en_US.UTF-8 \
- meson --prefix /usr \
- --sysconfdir /etc \
- --localstatedir /var \
- -Dblkid=true \
- -Dbuildtype=release \
- -Ddefault-dnssec=no \
- -Dfirstboot=false \
- -Dkill-path=/bin/kill \
- -Dkmod-path=/bin/kmod \
- -Dldconfig=false \
- -Dmount-path=/bin/mount \
- -Drootprefix= \
- -Drootlibdir=/lib \
- -Dsplit-usr=true \
- -Dsulogin-path=/sbin/sulogin \
- -Dsysusers=false \
- -Dumount-path=/bin/umount \
- -Db_lto=false \
- -Dc_link_args="-lblkid -lmount" \
- -Dc_args="-I/tools/include/blkid -I/tools/include/libmount" \
- $PWD build</userinput></screen>
+ <screen><userinput remap="configure">
+LANG=en_US.UTF-8 meson --prefix=/usr \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ -Dblkid=true \
+ -Dbuildtype=release \
+ -Ddefault-dnssec=no \
+ -Dfirstboot=false \
+ -Dkill-path=/bin/kill \
+ -Dkmod-path=/bin/kmod \
+ -Dldconfig=false \
+ -Dmount-path=/bin/mount \
+ -Drootprefix= \
+ -Drootlibdir=/lib \
+ -Dsplit-usr=true \
+ -Dsulogin-path=/sbin/sulogin \
+ -Dsysusers=false \
+ -Dumount-path=/bin/umount \
+ -Db_lto=false \
+ $PWD build</userinput></screen>
<variablelist>
<title>The meaning of the meson options:</title>
@@ -140,25 +137,6 @@ LANG=en_US.UTF-8 \
</listitem>
</varlistentry>
- <varlistentry>
- <term><parameter>-Dc_link_args="-lblkid -lmount"</parameter></term>
- <listitem>
- <para>This switch manually adds libblkid and libmount to the
- linker flags as they only exist in <filename>/tools/lib</filename>
- until <application>Util-Linux</application> is installed later in
- this chapter.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><parameter>-Dc_args="-I/tools/include/blkid -I/tools/include/libmount"</parameter></term>
- <listitem>
- <para>This switch manually adds the include paths for libblkid and
- libmount to the CFLAGS variable as the packages are not yet installed
- in the final system.</para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para>Compile the package:</para>