aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chapter08/introduction.xml2
-rw-r--r--chapter08/revisedchroot.xml2
-rw-r--r--chapter09/clock.xml5
-rw-r--r--chapter09/consoled.xml5
-rw-r--r--chapter09/locale.xml5
-rw-r--r--chapter10/kernel.xml6
-rw-r--r--general.ent80
-rw-r--r--part3intro/toolchaintechnotes.xml4
-rw-r--r--prologue/bookinfo.xml2
9 files changed, 76 insertions, 35 deletions
diff --git a/chapter08/introduction.xml b/chapter08/introduction.xml
index b63ce1c3e..b23175b3f 100644
--- a/chapter08/introduction.xml
+++ b/chapter08/introduction.xml
@@ -67,7 +67,7 @@
package building process. </para>
<para>For a more complete discussion of libraries, see the discussion
- <ulink url="&blfs-root;/view/&short-version;/introduction/libraries.html">
+ <ulink url="&blfs-book;introduction/libraries.html">
Libraries: Static or shared?</ulink> in the BLFS book.</para>
</sect2>
diff --git a/chapter08/revisedchroot.xml b/chapter08/revisedchroot.xml
index b1317c92d..3071240af 100644
--- a/chapter08/revisedchroot.xml
+++ b/chapter08/revisedchroot.xml
@@ -46,7 +46,7 @@ chroot "$LFS" /usr/bin/env -i \
<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
<para>For more information about libtool archive files, see the <ulink
- url="&blfs-book;/introduction/la-files.html">BLFS section "About Libtool
+ url="&blfs-book;introduction/la-files.html">BLFS section "About Libtool
Archive (.la) files"</ulink>.</para>
<para>The compiler built in <xref linkend="chapter-temporary-tools"/> and
diff --git a/chapter09/clock.xml b/chapter09/clock.xml
index 585017e35..01f0efef9 100644
--- a/chapter09/clock.xml
+++ b/chapter09/clock.xml
@@ -69,8 +69,9 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>timedatectl list-timezones</userinput></screen>
- <note><para>Please note that the <command>timedatectl</command> command can
- be used only on a system booted with systemd.</para></note>
+ <note><para>Please note that the <command>timedatectl</command> command
+ doesn't work in the chroot environment. It can only
+ be used after the LFS system is booted with systemd.</para></note>
<sect2>
<title>Network Time Synchronization</title>
diff --git a/chapter09/consoled.xml b/chapter09/consoled.xml
index 1425f0410..3abf16e3c 100644
--- a/chapter09/consoled.xml
+++ b/chapter09/consoled.xml
@@ -88,8 +88,9 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>localectl set-keymap MAP</userinput></screen>
- <note><para>Please note that the <command>localectl</command> command can
- be used only on a system booted with systemd.</para></note>
+ <note><para>Please note that the <command>localectl</command> command
+ doesn't work in the chroot environment. It can only
+ be used after the LFS system is booted with systemd.</para></note>
<para>You can also use <command>localectl</command> utility with the
corresponding parameters to change X11 keyboard layout, model, variant
diff --git a/chapter09/locale.xml b/chapter09/locale.xml
index 65cffc570..9c0cecb2b 100644
--- a/chapter09/locale.xml
+++ b/chapter09/locale.xml
@@ -132,8 +132,9 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
- <note><para>Please note that the <command>localectl</command> command can
- be used only on a system booted with systemd.</para></note>
+ <note><para>Please note that the <command>localectl</command> command
+ doesn't work in the chroot environment. It can only
+ be used after the LFS system is booted with systemd.</para></note>
<para>The <quote>C</quote> (default) and <quote>en_US</quote> (the recommended
one for United States English users) locales are different. <quote>C</quote>
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 77250cae6..f77cc9c5c 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -116,10 +116,10 @@
[ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED]
[*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---&gt;
[*] open by fhandle syscalls [CONFIG_FHANDLE]
-Processor type and features ---&gt;
- [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
Firmware Drivers ---&gt;
[*] Export DMI identification via sysfs to userspace [CONFIG_DMIID]
+General architecture-dependent options ---&gt;
+ [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP]
Networking support ---&gt;
Networking options ---&gt;
&lt;*&gt; The IPv6 protocol [CONFIG_IPV6]
@@ -336,7 +336,7 @@ EOF</userinput></screen>
<seglistitem>
<seg>config-&linux-version;,
- vmlinuz-&linux-version;-lfs-&version;
+ vmlinuz-&linux-version;-lfs-&version;,
and System.map-&linux-version;</seg>
<seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
</seglistitem>
diff --git a/general.ent b/general.ent
index 6cb34ee97..4f15d3fdd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,33 +1,76 @@
-<!-- Automatically generated by git-version.sh -->
+<!-- Editing up to the line of ==== should be enough
+ to generate a book for development, release, or rc-->
+<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
+ set to IGNORE for release or rc -->
+<!ENTITY % release "IGNORE"> <!-- set to INCLUDE for release,
+ set to IGNORE for development or rc -->
+<!ENTITY % rc "IGNORE"> <!-- set to INCLUDE for rc,
+ set to IGNORE for development or
+ release -->
+<!ENTITY % relnum "11.1"><!-- must be given for release or rc -->
+<!ENTITY % reldate "March 1st, 2022"><!-- must ve given for release or rc -->
+<!ENTITY % crdate "1999-2022"><!-- must ve given for release or rc -->
+<!ENTITY % rcnum "2"><!-- must be given only for rc -->
+<!-- ================================================================== -->
+<!-- Do not change anything below unless the www or book layouts change -->
+
+<!-- Automatically generated by git-version.sh. Used for release or dev -->
<!ENTITY % conditional-entities SYSTEM "conditional.ent">
%conditional-entities;
-<!-- version info automatically generated by git
- comment out the following two lines for release -->
+<![ %development; [
+<!-- version info automatically generated by git -->
<!ENTITY % version-entities SYSTEM "version.ent">
%version-entities;
+<![ %sysv; [
+<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; -->
+<!ENTITY errata "&lfs-root;lfs/errata/development/">
+]]>
+<![ %systemd; [
+<!ENTITY short-version "systemd"> <!-- Used below in &blfs-book; -->
+<!ENTITY errata "&lfs-root;lfs/errata/systemd/">
+]]>
+<!ENTITY generic-version "development"> <!-- Used below in
+ &patches-root;,
+ &donwloads-root;, and
+ &test-results; -->
+]]><!-- End %development -->
-<!-- uncomment and edit the following four lines
- for releases (including -rc) -->
-<!--
+<![ %release; [
<![ %sysv; [
-<!ENTITY version "10.2-rc1">
+<!ENTITY version "%relnum;">
+<!ENTITY short-version "%relnum;"> <!-- Used below in &blfs-book; -->
]]>
<![ %systemd; [
-<!ENTITY version "10.2-systemd-rc1">
+<!ENTITY version "%relnum;-systemd">
+<!ENTITY short-version "stable-systemd"> <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;"> <!-- Used below in
+ &patches-root;,
+ &donwloads-root;, and
+ &test-results; -->
+<!ENTITY releasedate "%reldate;">
+<!ENTITY copyrightdate "%crdate;">
]]>
-<!ENTITY releasedate "August 26th, 2021">
-<!ENTITY copyrightdate "1999-2021">
--->
+<![ %rc; [
<![ %sysv; [
-<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
- Change to x.y for release but not -rc releases -->
+<!ENTITY version "%relnum;-rc%rcnum;">
+<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; -->
]]>
<![ %systemd; [
-<!ENTITY short-version "systemd"> <!--Change to stable-systemd for release -->
+<!ENTITY version "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version "systemd"> <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+ &patches-root;,
+ &downloads-root;, and
+ &test-results; -->
+<!ENTITY releasedate "%reldate;">
+<!ENTITY copyrightdate "%crdate;">
]]>
-<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY lfs-root "https://www.linuxfromscratch.org/">
<!ENTITY blfs-root "&lfs-root;blfs/">
@@ -36,15 +79,10 @@
<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
<!ENTITY hints-index "&lfs-root;hints/list.html">
<!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
+<!-- Only used for sysv (lfs-bootscripts): -->
<!ENTITY downloads-root "&lfs-root;lfs/downloads/&generic-version;/">
<!ENTITY livecd-root "&lfs-root;livecd/">
<!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
-<![ %sysv; [
-<!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
-]]>
-<![ %systemd; [
-<!ENTITY errata "&lfs-root;lfs/errata/&short-version;/">
-]]>
<!ENTITY secadv "&lfs-root;lfs/advisories/">
<!ENTITY min-kernel "3.2">
<!--
diff --git a/part3intro/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml
index 72e3ab703..3bc54842a 100644
--- a/part3intro/toolchaintechnotes.xml
+++ b/part3intro/toolchaintechnotes.xml
@@ -38,8 +38,8 @@
<title>About Cross-Compilation</title>
<para>Cross-compilation involves some concepts that deserve a section on
- their own. Although this section may be omitted in a first reading,
- coming back to it later will be beneficial to your full understanding of
+ their own. Although this section may be omitted in a first reading,
+ coming back to it later will be beneficial to your full understanding of
the process.</para>
<para>Let us first define some terms used in this context:</para>
diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml
index aec113b20..18ba29e02 100644
--- a/prologue/bookinfo.xml
+++ b/prologue/bookinfo.xml
@@ -7,7 +7,7 @@
<bookinfo>
<title>Linux From Scratch</title>
- <subtitle>Version &version; </subtitle>
+ <subtitle>Version &version;</subtitle>
<subtitle>Published &releasedate;</subtitle>
<authorgroup>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-08 13:55:19 +0000