Changeset 38de42d for chapter08

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

402226e

Parents:

8acfbf67

git-author:

Thomas Trepl <thomas@…> (12/28/2020 08:33:15 AM)

git-committer:

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

Message:

Merge changes from trunk to multilib

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

Location:

chapter08

Files:

• autoconf.xml (modified) (1 diff)
• bash.xml (modified) (1 diff)
• coreutils.xml (modified) (2 diffs)
• meson.xml (modified) (1 diff)
• openssl.xml (modified) (1 diff)
• systemd.xml (modified) (6 diffs)
• tar.xml (modified) (1 diff)
• texinfo.xml (modified) (2 diffs)
• util-linux.xml (modified) (1 diff)

chapter08/autoconf.xml

@@ -41 +41 @@
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
-
+<!--
     <para>First, apply a patch fixes several problems that occur with the latest
     perl, libtool, and bash versions.</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&autoconf-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare Autoconf for compilation:</para>
 

chapter08/bash.xml

@@ -41 +41 @@
     <title>Installation of Bash</title>
 
-    <para>Incorporate some upstream fixes:</para>
+    <para>First, fix a race condition if using multiple cores:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i  '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>

chapter08/coreutils.xml

@@ -61 +61 @@
 <screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
 
+<para>Fix a problem with autoconf-2.70 in an included gnulib .m4 file:</para>
+
+<screen><userinput remap="pre">echo '# deleted' > m4/std-gnu11.m4</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 
@@ -84 +88 @@
         <listitem>
           <para>This environment variable allows the package to be 
-          built as the root user.
+          built as the <systemitem class="username">root</systemitem> user.
           </para>
         </listitem>

chapter08/meson.xml

@@ -48 +48 @@
   <sect2 role="installation">
     <title>Installation of Meson</title>
+
+    <para>First, apply a patch that fixes an issue with pkgconfig files
+    for static libraries:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
 
     <para>Compile Meson with the following command:</para>

chapter08/openssl.xml

@@ -69 +69 @@
 make MANSUFFIX=ssl install</userinput></screen>
 
-    <para>If desired, install the documentation:</para>
-
-<screen><userinput remap="install">mv -v /usr/share/doc/openssl /usr/share/doc/openssl-&openssl-version;
-cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
+    <para>Add the version to the documentation directory name, to be
+    consistent with other packages:</para>
+
+<screen><userinput remap="install">mv -v /usr/share/doc/openssl /usr/share/doc/openssl-&openssl-version;</userinput></screen>
+
+    <para>If desired, install some additional documentation:</para>
+
+<screen><userinput remap="install">cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
 
   </sect2>

chapter08/systemd.xml

@@ -47 +47 @@
 -->
 
+    <para>First, apply a patch to fix some regressions:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
+
     <para>Create a symlink to work around the xsltproc command not being installed:</para>
 
@@ -57 +61 @@
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '181,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
@@ -93 +97 @@
       -Duserdb=false                \
       -Dman=true                    \
+      -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
@@ -183 +188 @@
           <para>Remove two daemons that have dependencies that do not fit
           the scope of LFS.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dmode=release</parameter></term>
+        <listitem>
+          <para>Disable some features considered experimental by upstream.
+          </para>
         </listitem>
       </varlistentry>
@@ -366 +379 @@
         (symlink to systemctl), systemctl, systemd-analyze,
         systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
-        systemd-delta, systemd-detect-virt, systemd-escape, systemd-hwdb,
-        systemd-id128, systemd-inhibit, systemd-machine-id-setup,
+        systemd-delta, systemd-detect-virt, systemd-dissect, systemd-escape, 
+        systemd-hwdb, systemd-id128, systemd-inhibit, systemd-machine-id-setup,
         systemd-mount, systemd-notify, systemd-nspawn, systemd-path,
         systemd-repart, systemd-resolve (symlink to resolvectl), systemd-run,
@@ -695 +708 @@
       </varlistentry>
 
+      <varlistentry id="systemd-dissect">
+        <term><command>systemd-dissect</command></term>
+        <listitem>
+          <para>Is used to inspect OS disk images.</para>
+          <indexterm zone="ch-system-systemd systemd-dissect">
+            <primary sortas="b-systemd-dissect">systemd-dissect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-escape">
         <term><command>systemd-escape</command></term>

chapter08/tar.xml

@@ -57 +57 @@
         <listitem>
           <para>This forces the test for <function>mknod</function> to be run
-          as root.  It is generally considered dangerous to run this test as
-          the root user, but as it is being run on a system that has only been
+          as <systemitem class="username">root</systemitem>.
+          It is generally considered dangerous to run this test as
+          the <systemitem class="username">root</systemitem> user, but as it
+          is being run on a system that has only been
           partially built, overriding it is OK.</para>
         </listitem>

chapter08/texinfo.xml

@@ -44 +44 @@
     <para>Prepare Texinfo for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
-
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<!--
     <variablelist>
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
-        <term><parameter>--disable-static</parameter></term>
+        <term><parameter>- -disable-static</parameter></term>
         <listitem>
           <para>In this case, the top-level configure script will complain that
@@ -61 +61 @@
 
     </variablelist>
-
+-->
     <para>Compile the package:</para>
 

chapter08/util-linux.xml

@@ -89 +89 @@
     <para>If desired, run the test suite as a non-root user:</para>
 
-    <warning><para>Running the test suite as the root user can be harmful to
+    <warning><para>Running the test suite as the
+    <systemitem class="username">root</systemitem> user can be harmful to
     your system.  To run it, the CONFIG_SCSI_DEBUG option for the kernel must
     be available in the currently running system and must be built as a