| 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
in repository lfs.
commit 1373397baba044568d3c0a205c2599f7df84626f
Author: Thomas Trepl <[email protected]>
AuthorDate: Thu Sep 4 09:26:01 2025 +0200
Revert "Use linux kernel patch file"
This reverts commit 959aa89f8bfec9d0082405635a6ddc9c935bafb6.
LFS project has decided to not go base-patch. Therefore ML branch
reverts from the PoC back to what core LFS does.
---
chapter03/packages.xml | 10 ++++------
chapter05/linux-headers.xml | 5 -----
chapter10/kernel.xml | 15 +++++----------
packages.ent | 27 ++++++++++++---------------
4 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 2bbebf936..89cf94719 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -472,8 +472,6 @@
<para>Home page: <ulink url="&linux-home;"/></para>
<para>Download: <ulink url="&linux-url;"/></para>
<para>MD5 sum: <literal>&linux-md5;</literal></para>
- <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
@@ -482,10 +480,10 @@
version <!--should--> may be
used, unless the errata page says otherwise.</para>
- <para>We use the baseline version of the package and
- separately downloaded patches. This saves some download time
- as well as disk space as for subsequent patch level upgrades
- as only the patch file is required to download.
+ <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>
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index 2a6efea88..2c01e944c 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -47,11 +47,6 @@
by way of sanitizing various C header files that are shipped in the Linux
kernel source tarball.</para>
- <para>Update the kernel source tree from &linux-major-version;.&linux-minor-version;
- to &linux-version;:</para>
-
-<screen><userinput remap="pre">xzcat ../patch-&linux-version;.xz | patch -Np1</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 d5c2c21ac..9c8834c12 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -59,12 +59,12 @@
At this point optimization and customization is not a goal.
</para>
-
+
<para>
For general information on kernel configuration see <ulink
url="&hints-root;kernel-configuration.txt"/>. Additional information
about configuring and building the kernel can be found at <ulink
- url="&anduin-sources;/kernel-nutshell/"/>.
+ url="&anduin-sources;/kernel-nutshell/"/>.
These references are a bit
dated, but still give a reasonable overview of the process.
</para>
@@ -77,11 +77,6 @@
</para>
</important>
- <para>Update the kernel source tree from &linux-major-version;.&linux-minor-version;
- to &linux-version;:</para>
-
-<screen><userinput remap="pre">xzcat ../patch-&linux-version;.xz | patch -Np1</userinput></screen>
-
<para>Prepare for compilation by running the following command:</para>
<screen><userinput remap="pre">make mrproper</userinput></screen>
@@ -145,7 +140,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="kernel/systemd.xml"/>
-
+
<para>Enable some additional features if you are building a 64-bit
system. If you are using menuconfig, enable them in the order of
<parameter>CONFIG_PCI_MSI</parameter> first, then
@@ -215,7 +210,7 @@
[*] x32 ABI for 64-bit mode [CONFIG_X86_X32]
</screen>
</note>
-
+
<variablelist>
<title>The rationale for the above configuration items:</title>
@@ -389,7 +384,7 @@
<para>Support running the interrupt controller of 64-bit x86
processors in x2APIC mode. x2APIC may be enabled by firmware on
64-bit x86 systems, and a kernel without this option enabled will
- panic on boot if x2APIC is enabled by firmware. This option
+ panic on boot if x2APIC is enabled by firmware. This option
has no effect, but also does no harm if x2APIC is disabled by the
firmware.</para>
</listitem>
diff --git a/packages.ent b/packages.ent
index 638424554..dc447deb2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -436,22 +436,19 @@
merge conflicts here.
-->
<!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "4">
+<!ENTITY linux-minor-version "15">
+<!ENTITY linux-patch-version "6">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "149,042 KB">
-<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-major-version;.&linux-minor-version;.tar.xz">
-<!ENTITY linux-md5 "dd850269c3f456c0ff5518b1a2a81836">
+<!ENTITY linux-size "147,622 KB">
+<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
+<!ENTITY linux-md5 "019a3cea6458f01331dfa5afdd1ce252">
<!ENTITY linux-home "https://www.kernel.org/">
-<!ENTITY linux-patch-url "&kernel;linux/kernel/v&linux-major-version;.x/patch-&linux-version;.xz">
-<!ENTITY linux-patch-md5 "1b5656847514e2c451c68fa9d79da451">
-<!ENTITY linux-patch-size "529 KB">
-<!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 :
- minimum is allnoconfig
- typical is defconfig
- max is allyesconfig
- The disk usage is the sum of the size of linux-6.10.1 directory.
+<!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 :
+ minimum is allnoconfig
+ typical is defconfig
+ max is allyesconfig
+ The disk usage is the sum of the size of linux-6.10.1 directory.
It does not include an installed kernel or any modules.
-->
<!ENTITY linux-knl-du "1.7 - 14 GB (typically about 2.3 GB)">
@@ -681,8 +678,8 @@
<!ENTITY systemd-version "257.8">
<!--<!ENTITY systemd-stable "6b4878d">-->
-<!-- The above entity is used whenever we move to a stable backport branch.
- In the event of a critical problem or kernel change that is incompatible,
+<!-- The above entity is used whenever we move to a stable backport branch.
+ In the event of a critical problem or kernel change that is incompatible,
we will switch to the backport branch until the next stable release. -->
<!ENTITY systemd-size "16,002 KB">
<!ENTITY systemd-url "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
--
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