Changeset 6b6a1b9 for chapter08

Timestamp:

09/05/2023 02:34:34 PM (10 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64

Children:

73d91ac

Parents:

6786b0c (diff), e8f0a1b (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:

Merge remote-tracking branch 'origin/trunk' into xry111/arm64

Location:

chapter08

Files:

• autoconf.xml (modified) (1 diff)
• chapter08.xml (modified) (2 diffs)
• flit-core.xml (modified) (2 diffs)
• jinja2.xml (modified) (1 diff)
• markupsafe.xml (modified) (1 diff)
• meson.xml (modified) (1 diff)
• mpfr.xml (modified) (1 diff)
• openssl.xml (modified) (1 diff)
• procps.xml (modified) (1 diff)
• shadow.xml (modified) (2 diffs)
• stripping.xml (modified) (1 diff)
• systemd.xml (modified) (2 diffs)
• util-linux.xml (modified) (1 diff)
• wheel.xml (modified) (1 diff)

chapter08/autoconf.xml

@@ -154 +154 @@
           software package; it examines the source files in a directory tree,
           searching them for common portability issues, and creates a
-          <filename>configure.scan</filename> file that serves as as a
+          <filename>configure.scan</filename> file that serves as a
           preliminary <filename>configure.in</filename> file for the
           package</para>

chapter08/chapter08.xml

@@ -30 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
@@ -40 +41 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>

chapter08/flit-core.xml

@@ -43 +43 @@
     <para>Build the package:</para>
 
-<screen><userinput remap="install">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install the package:</para>
@@ -64 +64 @@
            <para>Instructs pip to put the created wheel into the
            <filename class='directory'>dist</filename> directory.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--no-cache-dir</parameter></term>
+        <listitem>
+          <para>Prevents pip from copying the created wheel into the
+          <filename class='directory'>/root/.cache/pip</filename>
+          directory.</para>
         </listitem>
       </varlistentry>

chapter08/jinja2.xml

@@ -43 +43 @@
     <para>Build the package:</para>
 
-<screen><userinput remap="install">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install the package:</para>

chapter08/markupsafe.xml

@@ -43 +43 @@
     <para>Compile MarkupSafe with the following command:</para>
 
-<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

chapter08/meson.xml

@@ -47 +47 @@
     <para>Compile Meson with the following command:</para>
 
-<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>The test suite requires some packages outside the scope of LFS.</para>

chapter08/mpfr.xml

@@ -41 +41 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
-
-    <!-- https://sympa.inria.fr/sympa/arc/mpfr/2023-01/msg00002.html
-         https://gitlab.inria.fr/mpfr/mpfr/-/commit/5172494c
-
-         Note that it's a different issue from Glibc #30068 we've fixed in
-         chapter08/glibc.xml with a sed.  Normally we just document the
-         test failure, but in this case the particular subtest also serves
-         as an additional guard against Glibc #30068.  So we apply the
-         upstream fix here.   -->
-    <para>Fix a test case based on a bug of old Glibc releases:</para>
-
-<screen><userinput remap="pre">sed -e 's/+01,234,567/+1,234,567 /' \
-    -e 's/13.10Pd/13Pd/'            \
-    -i tests/tsprintf.c</userinput></screen>
 
     <para>Prepare MPFR for compilation:</para>

chapter08/openssl.xml

@@ -100 +100 @@
         <emphasis>when upgrading to a version with the same MAJOR version
         number</emphasis>.
-      </para>
-
-      <!-- https://bugzilla.mindrot.org/show_bug.cgi?id=3548 -->
-      <para>
-        If <application>OpenSSH</application> is installed, it will be an
-        exception of the general rule above.  It contains an
-        over-restrictive OpenSSL version check, so both SSH client and SSH
-        server will refuse to start if OpenSSL
-        is updated with MAJOR version number unchanged but MINOR version
-        number changed.  You need to rebuild
-        <application>OpenSSH</application> after such an upgrade.
-        <emphasis role='bold'>If <application>OpenSSH</application> is being
-        used to access the system, you must rebuild and reinstall it
-        after upgrading OpenSSL to a new MINOR version number before logout
-        or you won't be able to login via SSH anymore.</emphasis>
       </para>
 

chapter08/procps.xml

@@ -68 +68 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
-<!--
-    <para>The test suite needs some custom modifications for LFS.
-    Remove a test that fails when scripting does not use a tty device and
-    fix two others.
-    To run the test suite, run the following commands:</para>
-
-<screen><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
-sed -i '/set tty/d' testsuite/pkill.test/pkill.exp
-rm testsuite/pgrep.test/pgrep.exp
-make check</userinput></screen>
--->
+<screen revision='sysv'><userinput remap="make">make</userinput></screen>
+<screen revision='systemd'><userinput remap="make">make src_w_LDADD='$(LDADD) -lsystemd'</userinput></screen>
+
     <para> To run the test suite, run:</para>
 

chapter08/shadow.xml

@@ -108 +108 @@
             --disable-static    \
             --with-{b,yes}crypt \
+            --without-libbsd    \
             --with-group-name-max-length=32</userinput></screen>
 
@@ -142 +143 @@
           <para>The longest permissible user name is 32 characters.  Make the maximum
           length of a group name the same.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-libbsd</parameter></term>
+        <listitem>
+           <para>Do not use the readpassphrase function from libbsd which
+           is not in LFS.  Use the internal copy instead.</para>
         </listitem>
       </varlistentry>

chapter08/stripping.xml

@@ -96 +96 @@
                libreadline.so.&readline-soversion;
                libz.so.&zlib-version;
+               libzstd.so.&zstd-version;
                $(cd /usr/lib; find libnss*.so* -type f)"
 

chapter08/systemd.xml

@@ -69 +69 @@
       -Dpamconfdir=no               \
       -Ddev-kvm-mode=0660           \
+      -Dnobody-group=nogroup        \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
@@ -177 +178 @@
           <filename class='devicefile'>/dev/kvm</filename>.  The editors
           consider it dangerous.  This option overrides it.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dnobody-group=nogroup</parameter></term>
+        <listitem>
+          <para>Tell the package the group name with GID 65534 is
+          <systemitem class='groupname'>nogroup</systemitem>.</para>
         </listitem>
       </varlistentry>

chapter08/util-linux.xml

@@ -1221 +1221 @@
           unique among all UUIDs created, on the local system and on other
           systems, in the past and in the future, with extremely high
-          probability (~340 trillion trillion trillion unique UUIDs are possible)</para>
+          probability (2<superscript>128</superscript> UUIDs are
+          possible)</para>
           <indexterm zone="ch-system-util-linux uuidgen">
             <primary sortas="b-uuidgen">uuidgen</primary>

chapter08/wheel.xml

@@ -43 +43 @@
     <para>Compile Wheel with the following command:</para>
 
-<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install Wheel with the following command:</para>