Changeset 5c4db70

Timestamp:

09/25/2024 10:30:09 PM (25 hours ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

a820136

Parents:

7988835 (diff), d77b09e (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:

• chapter09/network.xml (modified) (3 diffs)
• prologue/standards.xml (modified) (10 diffs)

chapter09/network.xml

@@ -199 +199 @@
      range 0-255.</para>
 
-     <para>A valid private IP address could be 192.168.1.1.</para>
+     <para>A valid private IP address could be 192.168.1.2.</para>
 
      <para>If the computer is to be visible to the Internet, a valid FQDN
@@ -219 +219 @@
 127.0.0.1 localhost.localdomain localhost
 127.0.1.1 <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable>
-<replaceable>&lt;192.168.1.1&gt;</replaceable> <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> <replaceable>[alias1] [alias2 ...]</replaceable>
+<replaceable>&lt;192.168.1.2&gt;</replaceable> <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> <replaceable>[alias1] [alias2 ...]</replaceable>
 ::1       localhost ip6-localhost ip6-loopback
 ff02::1   ip6-allnodes
@@ -227 +227 @@
 EOF</userinput></screen>
 
-     <para>The <replaceable>&lt;192.168.1.1&gt;</replaceable>,
+     <para>The <replaceable>&lt;192.168.1.2&gt;</replaceable>,
      <replaceable>&lt;FQDN&gt;</replaceable>, and
      <replaceable>&lt;HOSTNAME&gt;</replaceable> values need to be

prologue/standards.xml

@@ -33 +33 @@
 
         <para>The LSB has four separate specifications: Core, Desktop,
-        Runtime Languages, and Imaging.  Some parts of Core and Desktop
+        Languages, and Imaging.  Some parts of Core and Desktop
         specifications are architecture specific.  There are also two trial
         specifications: Gtk3 and Graphics.  LFS attempts to conform to the LSB
@@ -51 +51 @@
     <para>While it is possible to create a complete system that will pass the LSB
     certification tests <quote>from scratch,</quote> this can't be done without many additional packages
-    that are beyond the scope of the LFS book.  Installation instructions for these
+    that are beyond the scope of the LFS book.  Installation instructions for some of these
     additional packages can be found in BLFS. </para>
 
@@ -63 +63 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>Bash, Bc, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
-                Grep, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
-                Shadow, Tar, Util-linux, Zlib</para>
+          <para>
+            Bash, Bc, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
+            GCC, Gettext, Glibc, Grep, Gzip, M4, Man-DB, Procps, Psmisc,
+            Sed, Shadow, <phrase revision='sysv'>SysVinit</phrase><phrase
+            revision='systemd'>Systemd</phrase>, Tar, Util-linux, Zlib
+          </para>
         </listitem>
       </varlistentry>
@@ -77 +80 @@
 
       <varlistentry>
-        <term><emphasis>LSB Runtime Languages:</emphasis></term>
-        <listitem>
-          <para>Perl, Python</para>
+        <term><emphasis>LSB Languages:</emphasis></term>
+        <listitem>
+          <para>Perl</para>
         </listitem>
       </varlistentry>
@@ -108 +111 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, LSB-Tools, NSPR,
-          NSS, PAM, Pax, Sendmail (or Postfix or Exim), time
+          <para>At, Batch (a part of At), BLFS Bash Startup Files, Cpio, Ed,
+          Fcrontab, LSB-Tools, NSPR, NSS, Linux-PAM, Pax, Sendmail
+          (or Postfix or Exim), Time
           </para>
         </listitem>
@@ -118 +122 @@
         <listitem>
           <para>Alsa, ATK, Cairo, Desktop-file-utils, Freetype, Fontconfig,
-          Gdk-pixbuf, Glib2, GTK+2, Icon-naming-utils, Libjpeg-turbo, Libpng, Libtiff,
-          Libxml2, MesaLib, Pango, Xdg-utils, Xorg</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis>LSB Runtime Languages:</emphasis></term>
-        <listitem>
-          <para>Libxml2, Libxslt </para>
+          Gdk-pixbuf, Glib2, GLU, Icon-naming-utils, Libjpeg-turbo,
+          Libxml2, Mesa, Pango, Xdg-utils, Xorg</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><emphasis>LSB Languages:</emphasis></term>
+        <listitem>
+          <para>Libxml2, Libxslt</para>
         </listitem>
       </varlistentry>
@@ -147 +151 @@
 
     <variablelist>
-      <bridgehead renderas="sect3">Packages not supplied by LFS or BLFS
-      needed to satisfy the LSB Requirements</bridgehead>
+      <bridgehead renderas="sect3">Components not supplied or optionally
+      supplied by LFS or BLFS needed to satisfy the LSB
+      Requirements</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
@@ -155 +160 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>None</para>
+          <para>
+            <command>install_initd</command>,
+            <filename class='libraryfile'>libcrypt.so.1</filename>
+            (can be provided with optional instructions for the LFS
+            Libxcrypt package),
+            <filename class='libraryfile'>libncurses.so.5</filename>
+            (can be provided with optional instructions for the LFS
+            Ncurses package),
+            <filename class='libraryfile'>libncursesw.so.5</filename>
+            (but <filename class='libraryfile'>libncursesw.so.6</filename>
+            is provided by the LFS Ncurses package)
+          </para>
         </listitem>
       </varlistentry>
@@ -162 +178 @@
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
-          <para>Qt4 (but Qt5 is provided)</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis>LSB Runtime Languages:</emphasis></term>
-        <listitem>
-          <para>None</para>
+          <para>
+            <filename class='libraryfile'>libgdk-x11-2.0</filename>
+            (but <filename class='libraryfile'>libgdk-3.so</filename>
+            is provided by the BLFS GTK+-3 package),
+            <filename class='libraryfile'>libgtk-x11-2.0</filename>
+            (but <filename class='libraryfile'>libgtk-3.so</filename>
+            and <filename class='libraryfile'>libgtk-4.so</filename>
+            are provided by the BLFS GTK+-3 and GTK-4 packages),
+            <filename class='libraryfile'>libpng12.so</filename>
+            (but <filename class='libraryfile'>libpng16.so</filename>
+            is provided by the BLFS Libpng package),
+            <filename class='libraryfile'>libQt*.so.4</filename>
+            (but <filename class='libraryfile'>libQt6*.so.6</filename>
+            are provided by the BLFS Qt6 package),
+            <filename class='libraryfile'>libtiff.so.4</filename>
+            (but <filename class='libraryfile'>libtiff.so.6</filename>
+            is provided by the BLFS Libtiff package)
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><emphasis>LSB Languages:</emphasis></term>
+        <listitem>
+          <para><command>/usr/bin/python</command> (LSB requires Python2 but
+          LFS and BLFS only provide Python3)</para>
         </listitem>
       </varlistentry>
@@ -183 +217 @@
         <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
-          <para>None</para>
+          <para>
+            <filename class='libraryfile'>libpng15.so</filename>
+            (but <filename class='libraryfile'>libpng16.so</filename>
+            is provided by the BLFS Libpng package)
+          </para>
         </listitem>
       </varlistentry>