Changeset 784fdaed

Timestamp:

09/22/2021 09:17:28 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

d735604

Parents:

4467b18d

git-author:

Pierre Labastie <pierre.labastie@…> (09/01/2021 09:13:32 AM)

git-committer:

Pierre Labastie <pierre.labastie@…> (09/22/2021 09:17:28 PM)

Message:

Remove all versiond entities

Files:

• chapter01/askforhelp.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter07/cleanup.xml (modified) (2 diffs)
• chapter10/grub.xml (modified) (1 diff)
• chapter10/kernel.xml (modified) (3 diffs)
• chapter11/theend.xml (modified) (3 diffs)
• prologue/bookinfo.xml (modified) (1 diff)

chapter01/askforhelp.xml

@@ -39 +39 @@
     <itemizedlist>
       <listitem>
-        <para>The version of the book being used (in this case
-              <phrase revision="sysv">&version;</phrase>
-              <phrase revision="systemd">&versiond;</phrase>)</para>
+        <para>The version of the book being used (in this case &version;</para>
       </listitem>
       <listitem>

chapter01/changelog.xml

@@ -11 +11 @@
   <title>Changelog</title>
 
-  <para>This is version
-        <phrase revision="sysv">&version;</phrase>
-        <phrase revision="systemd">&versiond;</phrase>
-  of the Linux From Scratch book, dated
+  <para>This is version &version; of the Linux From Scratch book, dated
   &releasedate;. If this book is more than six months old, a newer and better
   version is probably already available. To find out, please check one of the

chapter07/cleanup.xml

@@ -128 +128 @@
     </note>
 
-<screen role="nodump" revision="sysv"><userinput>cd $LFS
+<screen role="nodump"><userinput>cd $LFS 
 tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
-
-<screen role="nodump" revision="systemd"><userinput>cd $LFS
-tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
 
   </sect2>
@@ -158 +155 @@
     your entire host system.  YOU ARE WARNED.</para></warning>
 
-<screen role="nodump" revision="sysv"><computeroutput>cd $LFS
-rm -rf ./*
+<screen role="nodump"><computeroutput>cd $LFS 
+rm -rf ./* 
 tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen>
-
-<screen role="nodump" revision="systemd"><computeroutput>cd $LFS
-rm -rf ./*
-tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen>
 
     <para>

chapter10/grub.xml

@@ -157 +157 @@
 set root=(hd0,2)
 
-menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
-        linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
+menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
+        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
 }</literal>
 EOF</userinput></screen>

chapter10/kernel.xml

@@ -228 +228 @@
 <screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
+<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
     <para><filename>System.map</filename> is a symbol file for the kernel.
@@ -337 +337 @@
       <seglistitem>
         <seg>config-&linux-version;,
-        <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
-        <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
+        vmlinuz-&linux-version;-lfs-&version;
         and System.map-&linux-version;</seg>
         <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
@@ -360 +359 @@
 
       <varlistentry id="lfskernel">
-        <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
-        <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
+        <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the computer,

chapter11/theend.xml

@@ -32 +32 @@
   running:</para>
 
-<screen revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
+<screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
 
-<screen revision="systemd"><userinput>echo &versiond; &gt; /etc/lfs-release</userinput></screen>
-
-  <para>Two files describing the installed system may be used by packages
-  that can be installed on the system later, either in binary form or by building
+  <para>Two files describing the installed system may be used by packages that
+  can be installed on the system later, either in binary form or by building
   them.</para>
 
@@ -44 +42 @@
   this file, run:</para>
 
-<screen revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+<screen><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
 DISTRIB_ID="Linux From Scratch"
 DISTRIB_RELEASE="&version;"
-DISTRIB_CODENAME="&lt;your name here&gt;"
-DISTRIB_DESCRIPTION="Linux From Scratch"
-EOF</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
-DISTRIB_ID="Linux From Scratch"
-DISTRIB_RELEASE="&versiond;"
 DISTRIB_CODENAME="&lt;your name here&gt;"
 DISTRIB_DESCRIPTION="Linux From Scratch"
@@ -62 +53 @@
   this file, run:</para>
 
-<screen revision="sysv"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
 NAME="Linux From Scratch"
 VERSION="&version;"
 ID=lfs
 PRETTY_NAME="Linux From Scratch &version;"
-VERSION_CODENAME="&lt;your name here&gt;"
-EOF</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
-NAME="Linux From Scratch"
-VERSION="&versiond;"
-ID=lfs
-PRETTY_NAME="Linux From Scratch &versiond;"
 VERSION_CODENAME="&lt;your name here&gt;"
 EOF</userinput></screen>

prologue/bookinfo.xml

@@ -8 +8 @@
 <bookinfo>
   <title>Linux From Scratch</title>
-  <subtitle revision='sysv'   >Version &version; </subtitle>
-  <subtitle revision='systemd'>Version &versiond;</subtitle>
+  <subtitle>Version &version; </subtitle>
   <subtitle>Published &releasedate;</subtitle>