aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXi Ruoyao <xry111@xry111.site>2023-08-27 00:10:38 +0800
committerXi Ruoyao <xry111@xry111.site>2023-08-27 00:10:38 +0800
commit8e0cd3da7e8664dfcfc46fe8ef9ccde41493b636 (patch)
treea41526e1356f01c21414c0b9fbf79a3e7ba916a5
parentfc4ba57b4a3d6d05525b229e9200ff7ca5561644 (diff)
parent11cfb5bc71de4fb7a77f369355dbca99e64ea16b (diff)
Merge remote-tracking branch 'origin/trunk' into xry111/loongarch
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter09/usage.xml2
-rw-r--r--packages.ent8
3 files changed, 15 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d0f012ebe..b8becd52f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
<para>2023-08-18</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to linux-6.4.12. Fixes
+ <ulink url='&lfs-ticket-root;5320'>#5320</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2023-08-18</para>
+ <itemizedlist>
+ <listitem>
<para>[bdubbs] - Update to udev-lfs-20230818.</para>
</listitem>
</itemizedlist>
diff --git a/chapter09/usage.xml b/chapter09/usage.xml
index 2e9843988..b14f3635c 100644
--- a/chapter09/usage.xml
+++ b/chapter09/usage.xml
@@ -146,7 +146,7 @@ EOF</userinput></screen>
an <emphasis>S</emphasis>, and all of them have two numbers following the
initial letter. The K means to stop (kill) a service and the S means to start a
service. The numbers determine the order in which the scripts are run, from 00
- to 99&mdash;the smaller the number, the sooner tht script runs. When
+ to 99&mdash;the smaller the number, the sooner the script runs. When
<command>init</command> switches to another run level, the appropriate services
are either started or stopped, depending on the run level chosen.</para>
diff --git a/packages.ent b/packages.ent
index 83b59a207..67f5bef38 100644
--- a/packages.ent
+++ b/packages.ent
@@ -433,12 +433,12 @@
<!ENTITY linux-major-version "6">
<!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "10">
+<!ENTITY linux-patch-version "12">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "134,621 KB">
+<!ENTITY linux-size "134,616 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "2e19e7badc3d4b080bf6b4864912f2d3">
+<!ENTITY linux-md5 "24570ba0ef9dd592bd640a1a41686fac">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
allnoconfig rounded down to allow for ongoing cleanups,
@@ -765,7 +765,7 @@
<!ENTITY zlib-version "1.2.13">
<!ENTITY zlib-size "1267 KB">
-<!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz">
+<!ENTITY zlib-url "&anduin-sources;/zlib-&zlib-version;.tar.xz">
<!ENTITY zlib-md5 "7d9fc1d78ae2fa3e84fe98b77d006c63">
<!ENTITY zlib-home "https://www.zlib.net/">
<!ENTITY zlib-fin-du "6.2 MB">