Changeset f5ae110a for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

8a67f19

Parents:

cad96bf

git-author:

Thomas Trepl <thomas@…> (05/16/2019 06:29:32 AM)

git-committer:

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

Message:

Merge changes from trunk

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

Location:

chapter06

Files:

• eudev.xml (modified) (1 diff)
• gcc.xml (modified) (1 diff)
• man-db.xml (modified) (2 diffs)
• systemd.xml (modified) (1 diff)

chapter06/eudev.xml

@@ -50 +50 @@
 <screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
 -->
-    <para>Next, add a workaround to prevent the /tools directory from being 
+    <para>First, add a workaround to prevent the /tools directory from being 
     hard coded into Eudev binary files library locations:</para>
 

chapter06/gcc.xml

@@ -77 +77 @@
     <para>Prepare GCC for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">SED=sed                               \
+<screen><userinput arch="default" remap="configure">mloptions="--disable-multilib"</userinput>
+<userinput arch="ml_32,ml_x32,ml_all" remap="configure">mloptions="--enable-multilib --with-multilib-list=m64"</userinput>
+<userinput arch="ml_32,ml_all" remap="configure">mloptions="$mloptions,m32"</userinput>
+<userinput arch="ml_x32,ml_all" remap="configure">mloptions="$mloptions,mx32"</userinput>
+<userinput remap="configure">SED=sed                               \
 ../configure --prefix=/usr            \
              --enable-languages=c,c++ \
-             --disable-multilib       \
              --disable-bootstrap      \
-             --with-system-zlib</userinput></screen>
-<screen arch="ml_32"><userinput remap="configure">SED=sed                               \
-../configure --prefix=/usr                     \
-             --enable-languages=c,c++          \
-             --enable-multilib                 \
-             --with-multilib-list=m32,m64      \
-             --disable-bootstrap               \
-             --with-system-zlib</userinput></screen>
-<screen arch="ml_x32"><userinput remap="configure">SED=sed                               \
-../configure --prefix=/usr                     \
-             --enable-languages=c,c++          \
-             --enable-multilib                 \
-             --with-multilib-list=mx32,m64     \
-             --disable-bootstrap               \
-             --with-system-zlib</userinput></screen>
-<screen arch="ml_all"><userinput remap="configure">SED=sed                               \
-../configure --prefix=/usr                     \
-             --enable-languages=c,c++          \
-             --enable-multilib                 \
-             --with-multilib-list=m32,mx32,m64 \
-             --disable-bootstrap               \
-             --with-system-zlib</userinput></screen>
+             --with-system-zlib       \
+             $mloptions</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that

chapter06/man-db.xml

@@ -44 +44 @@
     <para>Prepare Man-DB for compilation:</para>
 
-<screen revision="systemd"><userinput remap="configure">./configure --prefix=/usr                        \
+<screen revision="systemd"><userinput remap="configure">sed -i '/find/s@/usr@@' init/systemd/man-db.service.in
+
+./configure --prefix=/usr                        \
             --docdir=/usr/share/doc/man-db-&man-db-version; \
             --sysconfdir=/etc                    \
@@ -67 +69 @@
       <title>The meaning of the configure options:</title>
 
+      <varlistentry revision="systemd">
+        <term><command>sed -i '/find/s@/usr@@' init/systemd/man-db.service.in</command></term>
+        <listitem>
+          <para>This changes a harcoded path to the <command>find</command>
+          utility, which we install in
+          <filename class="directory">/bin</filename>.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--disable-setuid</parameter></term>

chapter06/systemd.xml

@@ -199 +199 @@
 <screen><userinput remap="adjust">systemd-machine-id-setup</userinput></screen>
 
-    <para>Create the <filename>/lib/systemd/systemd-user-sessions</filename>
-    script to allow unprivileged user logins without
+    <para>Prevent systemd from creating <filename>/run/nologin</filename>
+    to allow unprivileged user logins without
     <application>systemd-logind</application>:</para>
 
-<screen><userinput remap="adjust">cat &gt; /lib/systemd/systemd-user-sessions &lt;&lt; "EOF"
-#!/bin/bash
-rm -f /run/nologin
-EOF
-chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
+<screen><userinput remap="adjust">rm -f /usr/lib/tmpfiles.d/systemd-nologin.conf</userinput></screen>
 
   </sect2>