Changeset cfb8eea

Timestamp:

07/22/2021 03:45:08 AM (23 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

f18f2d6

Parents:

118b207 (diff), 4eee9cc (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:

• chapter01/changelog.xml (modified) (1 diff)
• chapter05/glibc.xml (modified) (1 diff)
• chapter08/dejagnu.xml (modified) (3 diffs)
• chapter08/expect.xml (modified) (4 diffs)
• chapter08/glibc.xml (modified) (1 diff)
• chapter08/tcl.xml (modified) (6 diffs)
• packages.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-07-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Correct page IDs in Chapter 08 dejagnu, expect, and
+          tcl.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Ensure that glibc installs ldconfig and sln to 
+          <filename class="directory">/usr/sbin</filename>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-20</para>
       <itemizedlist>

chapter05/glibc.xml

@@ -75 +75 @@
 <screen><userinput remap="pre">mkdir -v build
 cd       build</userinput></screen>
+
+    <para>Ensure that the <command>ldconfig</command> and <command>sln</command>
+    utilites are installed into
+    <filename class="directory">/usr/sbin</filename>:</para>
+
+<screen><userinput remap="pre">echo "rootsbindir=/usr/sbin" &gt; configparms</userinput></screen>
 
     <para>Next, prepare Glibc for compilation:</para>

chapter08/dejagnu.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-tools-dejagnu" role="wrap">
+<sect1 id="ch-system-dejagnu" role="wrap">
   <?dbhtml filename="dejagnu.html"?>
 
@@ -17 +17 @@
   <title>DejaGNU-&dejagnu-version;</title>
 
-  <indexterm zone="ch-tools-dejagnu">
+  <indexterm zone="ch-system-dejagnu">
     <primary sortas="a-DejaGNU">DejaGNU</primary>
   </indexterm>
@@ -89 +89 @@
           <para>A wrapper script that locates the proper
           <command>expect</command> shell and then runs DejaGNU</para>
-          <indexterm zone="ch-tools-dejagnu runtest">
+          <indexterm zone="ch-system-dejagnu runtest">
             <primary sortas="b-runtest">runtest</primary>
           </indexterm>

chapter08/expect.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-tools-expect" role="wrap">
+<sect1 id="ch-system-expect" role="wrap">
   <?dbhtml filename="expect.html"?>
 
@@ -17 +17 @@
   <title>Expect-&expect-version;</title>
 
-  <indexterm zone="ch-tools-expect">
+  <indexterm zone="ch-system-expect">
     <primary sortas="a-Expect">Expect</primary>
   </indexterm>
@@ -117 +117 @@
           <para>Communicates with other interactive programs according
           to a script</para>
-          <indexterm zone="ch-tools-expect expect">
+          <indexterm zone="ch-system-expect expect">
             <primary sortas="b-expect">expect</primary>
           </indexterm>
@@ -128 +128 @@
           <para>Contains functions that allow Expect to be used as a Tcl
           extension or to be used directly from C or C++ (without Tcl)</para>
-          <indexterm zone="ch-tools-expect libexpect">
+          <indexterm zone="ch-system-expect libexpect">
             <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
           </indexterm>

chapter08/glibc.xml

@@ -65 +65 @@
 <screen><userinput remap="pre">mkdir -v build
 cd       build</userinput></screen>
+
+    <para>Ensure that the <command>ldconfig</command> and <command>sln</command>
+    utilites are installed into
+    <filename class="directory">/usr/sbin</filename>:</para>
+
+<screen><userinput remap="pre">echo "rootsbindir=/usr/sbin" &gt; configparms</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>

chapter08/tcl.xml

@@ -8 +8 @@
 ]>
 
-<sect1 id="ch-tools-tcl" role="wrap">
+<sect1 id="ch-system-tcl" role="wrap">
   <?dbhtml filename="tcl.html"?>
 
@@ -19 +19 @@
   <title>Tcl-&tcl-version;</title>
 
-  <indexterm zone="ch-tools-tcl">
+  <indexterm zone="ch-system-tcl">
     <primary sortas="a-Tcl">Tcl</primary>
   </indexterm>
@@ -173 +173 @@
         <listitem>
           <para>The Tcl command shell</para>
-          <indexterm zone="ch-tools-tcl tclsh&tcl-major-version;">
+          <indexterm zone="ch-system-tcl tclsh&tcl-major-version;">
             <primary sortas="b-tclsh&tcl-major-version;">tclsh&tcl-major-version;</primary>
           </indexterm>
@@ -183 +183 @@
         <listitem>
           <para>A link to tclsh&tcl-major-version;</para>
-          <indexterm zone="ch-tools-tcl tclsh">
+          <indexterm zone="ch-system-tcl tclsh">
             <primary sortas="b-tclsh">tclsh</primary>
           </indexterm>
@@ -193 +193 @@
         <listitem>
           <para>The Tcl library</para>
-          <indexterm zone="ch-tools-tcl libtcl&tcl-major-version;.so">
+          <indexterm zone="ch-system-tcl libtcl&tcl-major-version;.so">
             <primary sortas="c-libtcl&tcl-major-version;.so">libtcl&tcl-major-version;.so</primary>
           </indexterm>
@@ -203 +203 @@
         <listitem>
           <para>The Tcl Stub library</para>
-          <indexterm zone="ch-tools-tcl libtclstub&tcl-major-version;.a">
+          <indexterm zone="ch-system-tcl libtclstub&tcl-major-version;.a">
             <primary sortas="c-libtclstub&tcl-major-version;.a">libtclstub&tcl-major-version;.a</primary>
           </indexterm>

packages.ent

@@ -441 +441 @@
 <!ENTITY linux-md5 "50aa48ae38a736b3f313a777574af3d3">
 <!ENTITY linux-home "https://www.kernel.org/">
-<!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
- allnoconfig extended for a hopefully-bootable build on desktop machine,
- max is allmodconfig which requires openssl -->
-<!ENTITY linux-knl-du "1200 - 6750 MB (typically about 1500 MB)">
-<!ENTITY linux-knl-sbu "5.0 - 125.0 SBU (typically about 9 SBU)">
+<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
+ allnoconfig rounded down to allow for ongoing cleanups,
+ max is allmodconfig  -->
+<!ENTITY linux-knl-du "1200 - 8800 MB (typically about 1700 MB)">
+<!ENTITY linux-knl-sbu "1.5 - 130.0 SBU (typically about 12 SBU)">
 
 <!ENTITY linux-headers-tmp-du "1.1 GB">