Changeset 3e09569

Timestamp:

02/05/2022 04:45:10 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

2590473

Parents:

51d1584 (diff), 0a75d62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter05/binutils-pass1.xml (modified) (1 diff)
• chapter06/binutils-pass2.xml (modified) (1 diff)
• chapter07/createfiles.xml (modified) (1 diff)
• chapter08/binutils.xml (modified) (1 diff)
• chapter08/systemd.xml (modified) (1 diff)
• chapter09/networkd.xml (modified) (1 diff)
• lfs-latest-git.php (modified) (2 diffs)

chapter05/binutils-pass1.xml

@@ -145 +145 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install -j1</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>-j1</parameter></term>
-        <listitem>
-          <para>An issue in the building system may cause the installation
-          to fail with <option>-j N</option> in <envar>MAKEFLAGS</envar>.
-          Override it to workaround this issue.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+<screen><userinput remap="install">make install</userinput></screen>
 
   </sect2>

chapter06/binutils-pass2.xml

@@ -107 +107 @@
     to link against zlib from the host distribution:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install -j1
+<screen><userinput remap="install">make DESTDIR=$LFS install
 install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
 

chapter07/createfiles.xml

@@ -75 +75 @@
 daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
-systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/usr/bin/false
 systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/usr/bin/false
 systemd-journal-remote:x:74:74:systemd Journal Remote:/:/usr/bin/false

chapter08/binutils.xml

@@ -196 +196 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make tooldir=/usr install -j1</userinput></screen>
+<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
 
     <para>Remove useless static libraries:</para>

chapter08/systemd.xml

@@ -132 +132 @@
           <filename>/etc/group</filename> and
           <filename>/etc/passwd</filename> files. Both files
-          were created earlier in this chapter.</para>
+          were created earlier in this chapter. This daemon is not useful
+          on an LFS system since user accounts are manually created.</para>
         </listitem>
       </varlistentry>

chapter09/networkd.xml

@@ -185 +185 @@
       (ex: a <command>resolvconf</command> program other than the one
       provided by systemd), the <command>systemd-resolved</command> service
-      should not be used.</para></note>
+      should not be used.</para>
+
+      <para>To disable systemd-resolved, issue the following command:</para>
+
+<screen role="nodump"><userinput>systemctl disable systemd-resolved</userinput></screen></note>
 
       <para>When using <command>systemd-resolved</command> for DNS
       configuration, it creates the file
-      <filename>/run/systemd/resolve/resolv.conf</filename>. Create a
+      <filename>/run/systemd/resolve/resolv.conf</filename>.</para>
+      <!--Create a
       symlink in <filename>/etc</filename> to use the generated file:</para>
 
 <screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
-
+      At least in systemd-250, this file gets created on first bootup.
+      -->
     </sect3>
 

lfs-latest-git.php

@@ -134 +134 @@
 if ( $package == "Jinja"      ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
-if ( $package == "tcl"        ) $dirpath = "https://sourceforge.net/projects/tcl/files";
+//if ( $package == "tcl"        ) $dirpath = "https://sourceforge.net/projects/tcl/files";
+if ( $package == "tcl"        ) $dirpath = "https://www.tcl.tk/software/tcltk/download.html";
 if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
 if ( $package == "vim"        ) $dirpath = "https://github.com/vim/vim/tags";
@@ -265 +266 @@
 
   if ( $package == "tcl" )
-     return find_max( $lines, "/tcl/", "/^.*tcl(\d[\d\.]*\d)-src.*$/" );
+     return find_max( $lines, "/tcl\d/", "/^.*tcl(\d\.[\d\.]*\d)-src.*$/" );
 
   if ( $package == "ninja" )