From 208415b81b2909fbec563340e303cd4b6d5a0c5f Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 1 Jun 2025 12:26:06 +0800
Subject: [PATCH 1/4] reboot: Remove references to files we no longer create
And note /etc/resolv.conf is optional for the systemd revision.
---
chapter11/reboot.xml | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 5a8cfd51e..497445346 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -88,17 +88,14 @@
</para>
<itemizedlist>
- <listitem><para>/etc/bashrc </para></listitem>
- <listitem><para>/etc/dircolors </para></listitem>
<listitem><para>/etc/fstab </para></listitem>
<listitem><para>/etc/hosts </para></listitem>
<listitem><para>/etc/inputrc </para></listitem>
<listitem><para>/etc/profile </para></listitem>
- <listitem><para>/etc/resolv.conf </para></listitem>
+ <listitem><para>/etc/resolv.conf
+ <phrase revision='systemd'>(optional)</phrase></para></listitem>
<listitem><para>/etc/vimrc </para></listitem>
- <listitem><para>/root/.bash_profile </para></listitem>
- <listitem><para>/root/.bashrc </para></listitem>
- <listitem revision="sysv"><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
+ <listitem revision="sysv"><para>/etc/sysconfig/ifconfig.eth0</para></listitem>
</itemizedlist>
</listitem>
</itemizedlist>
From 455724dc3478ad19a1e735a132a865d54edc942c Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 1 Jun 2025 12:54:01 +0800
Subject: [PATCH 2/4] patches: Fix a typo
---
chapter03/patches.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 435fa6acd..94b36acb5 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -53,7 +53,7 @@
</varlistentry>
<varlistentry>
- <term>Coreutils Upstream Fixe Patch - <token>&coreutils-upstream-patch-size;</token>:</term>
+ <term>Coreutils Upstream Fix Patch - <token>&coreutils-upstream-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&coreutils-upstream-patch;"/></para>
<para>MD5 sum: <literal>&coreutils-upstream-patch-md5;</literal></para>
From 1b223fbe4352235dcc42489fa64fbfddf528b5ca Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 1 Jun 2025 21:49:48 +0800
Subject: [PATCH 3/4] python: Also add --without-static-libpython to the
temporary installation
Without it, in the final system
/usr/lib/python3.13/config-3.13-$triple/libpython3.13.a is a remnant
from chapter 7 instead of being absent, defeating our will to save
space.
---
chapter07/python.xml | 14 +++++++++++---
chapter08/python.xml | 8 --------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/chapter07/python.xml b/chapter07/python.xml
index 872cf4a36..a75d5ad6f 100644
--- a/chapter07/python.xml
+++ b/chapter07/python.xml
@@ -52,9 +52,10 @@
<para>Prepare Python for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr \
- --enable-shared \
- --without-ensurepip</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+ --enable-shared \
+ --without-ensurepip \
+ --without-static-libpython</userinput></screen>
<variablelist>
<title>The meaning of the configure option:</title>
@@ -74,6 +75,13 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>--without-static-libpython</parameter></term>
+ <listitem>
+ <para>This switch prevents building a large, but unneeded, static
+ library.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>Compile the package:</para>
diff --git a/chapter08/python.xml b/chapter08/python.xml
index 0cbce0b0c..63a7e24cd 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -77,14 +77,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><parameter>--without-static-libpython</parameter></term>
- <listitem>
- <para>This switch prevents building a large, but unneeded, static
- library.</para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para>Compile the package:</para>
From c24d5641af09d926b73e62e1384d4ba78cca137a Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 3 Jun 2025 17:03:08 +0800
Subject: [PATCH 4/4] ncurses: Fix the shared lib file name referenced in text
---
chapter08/ncurses.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index 84970f306..e2f7415eb 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -127,7 +127,7 @@
make will spawn new shell processes during "make install". -->
<para>The installation of this package will overwrite
- <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
+ <filename class="libraryfile">libncursesw.so.&ncurses-base-version;</filename>
in-place. It may crash the shell process which is using code and data
from the library file. Install the package with
<literal>DESTDIR</literal>, and replace the library file correctly using