[lfs] 02/02: Use base version tarball plus patchfile for Linux kernel

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib_linux-patch
in repository lfs.

commit 6d287ea542bddcb6928f5bfacc33e1377f5baf23
Author: Thomas Trepl <[email protected]>
AuthorDate: Thu Jan 2 20:00:37 2025 +0100

    Use base version tarball plus patchfile for Linux kernel
---
 chapter03/packages.xml      | 16 +---------------
 chapter03/patches.xml       | 17 +++++++++++++++++
 chapter05/linux-headers.xml |  4 ++++
 chapter10/kernel.xml        |  4 ++++
 packages.ent                | 22 ++++++++++++++++++----
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 62e57c399..0a58c80f0 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -476,25 +476,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-version;) - <token>&linux-size;</token>:</term>
+      <term>Linux (&linux-base-version;) - <token>&linux-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&linux-home;"/></para>
         <para>Download: <ulink url="&linux-url;"/></para>
         <para>MD5 sum: <literal>&linux-md5;</literal></para>
-
-        <note>
-          <para>The Linux kernel is updated quite frequently, many times due to
-          discoveries of security vulnerabilities.  The latest available
-          <!--&linux-major-version;.&linux-minor-version;.x--> stable kernel
-          version <!--should--> may be
-          used, unless the errata page says otherwise.</para>
-
-          <para>For users with limited speed or expensive bandwidth who wish to
-          update the Linux kernel, a baseline version of the package and
-          patches can be downloaded separately.  This may save some time or
-          cost for a subsequent patch level upgrade within a minor release.
-          </para>
-        </note>
       </listitem>
     </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1956d39f5..1409a79d7 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -101,6 +101,23 @@
         <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+
+    <varlistentry>
+      <term>Linux Patch (from &linux-base-version; to &linux-version;) - <token>&linux-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&linux-patch-url;"/></para>
+        <para>MD5 sum: <literal>&linux-patch-md5;</literal></para>
+
+        <note>
+          <para>The Linux kernel is updated quite frequently, many times due to
+          discoveries of security vulnerabilities.  The latest available
+          <!--&linux-major-version;.&linux-minor-version;.x--> stable kernel
+          version <!--should--> may be
+          used, unless the errata page says otherwise.</para>
+        </note>
+      </listitem>
+    </varlistentry>
+
 <!--
     <varlistentry>
       <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index 2c01e944c..a7e74939a 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -47,6 +47,10 @@
     by way of sanitizing various C header files that are shipped in the Linux
     kernel source tarball.</para>
 
+    <para>Patch the kernel source to version &linux-version;:</para>
+
+<screen><userinput remap="pre">xzcat ../patch-&linux-version;.xz | patch -p1</userinput></screen>
+
     <para>Make sure there are no stale files embedded in the package:</para>
 
 <screen><userinput remap="pre">make mrproper</userinput></screen>
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 9a7ca42f3..c0e9c8fe1 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -77,6 +77,10 @@
       </para>
     </important>
 
+    <para>Patch the kernel source to version &linux-version;:</para>
+
+<screen><userinput remap="pre">xzcat ../patch-&linux-version;.xz | patch -p1</userinput></screen>
+
     <para>Prepare for compilation by running the following command:</para>
 
 <screen><userinput remap="pre">make mrproper</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 2f05068ce..05e5acab2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -439,14 +439,28 @@
 <!ENTITY libxcrypt-fin-du "12 MB">
 <!ENTITY libxcrypt-fin-sbu "0.1 SBU">
 
+<!--
+   Updates on linux versions usually happen in the 'patch' version
+   When updating the patch version, only the entities
+     * linux-patch-size
+     * linux-patch-md5
+   needs to be updated.
+   When a new minor version appears, the
+     * linux-major/minor-version is updated and the
+     * linux-patch-version is set to 1 as we do not use .0 versions
+     * linux-patch-size and linux-patch-md5 updated accordingly
+-->
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "12">
 <!ENTITY linux-patch-version "7">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-base-version "&linux-major-version;.&linux-minor-version;">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "144,501 KB">
-<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "267a2cec0d794454a9f92a726280b56d">
+<!ENTITY linux-size "144,440 KB">
+<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-base-version;.tar.xz">
+<!ENTITY linux-md5 "844fae6a58c7f43af44d8cea8484b4a1">
+<!ENTITY linux-patch-size "646 KB">
+<!ENTITY linux-patch-md5  "c98ed37cda9d715f89f9758476826a1f">
+<!ENTITY linux-patch-url "&kernel;linux/kernel/v&linux-major-version;.x/patch-&linux-version;.xz">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
  minimum is allnoconfig 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.