Changeset be00729f for chapter06/systemd.xml

Timestamp:

03/31/2021 10:41:35 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

15fd2f2

Parents:

b2c61c6

git-author:

Thomas Trepl <thomas@…> (07/27/2019 11:23:07 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:35 AM)

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11644 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter06/systemd.xml (modified) (7 diffs)

chapter06/systemd.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
-    <!--
-    <para>Apply a patch to fix two critical security vulnerabilities:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-240-security_fixes-2.patch</userinput></screen>
-    -->
 
     <para>Create a symlink to work around missing xsltproc:</para>
@@ -71 +66 @@
 <screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules/50-udev-default.rules.in</userinput></screen>
 
+<!-- EDITORS NOTE: At the next systemd release, see if the CFLAGS can be removed. -->
+
     <para>Prepare systemd for compilation:</para>
 
-    <screen><userinput remap="configure">mkdir -p build
+<screen><userinput remap="configure">mkdir -p build
 cd       build
 
 PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \
 LANG=en_US.UTF-8                   \
+CFLAGS+="-Wno-format-overflow"     \
 meson --prefix=/usr                \
       --sysconfdir=/etc            \
@@ -86 +84 @@
       -Dfirstboot=false            \
       -Dinstall-tests=false        \
-      -Dkill-path=/bin/kill        \
       -Dkmod-path=/bin/kmod        \
       -Dldconfig=false             \
@@ -97 +94 @@
       -Dumount-path=/bin/umount    \
       -Db_lto=false                \
+      -Drpmmacrosdir=no            \
       ..</userinput></screen>
 
@@ -175 +173 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Drpmmacrosdir=no</parameter></term>
+        <listitem>
+          <para>This switch disables installation of RPM Macros
+          for use with systemd because LFS does not support RPM.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
@@ -189 +194 @@
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary directory and file:</para>
-
-<screen><userinput remap="install">rm -rfv /usr/lib/rpm
-rm -f /usr/bin/xsltproc</userinput></screen>
+    <para>Remove an unnecessary symbolic link:</para>
+
+<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
@@ -198 +202 @@
 
 <screen><userinput remap="adjust">systemd-machine-id-setup</userinput></screen>
+
+    <para>Remove symbolic links to Util-Linux libraries:</para>
+
+<screen><userinput remap="adjust">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
 
     <para>Prevent systemd from creating <filename>/run/nologin</filename>