From 615f5b80b0502c3b22e82d49cdd67e009081751c Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 11:13:32 +0200 Subject: Remove all versiond entities --- chapter01/askforhelp.xml | 4 +--- chapter01/changelog.xml | 5 +---- chapter07/cleanup.xml | 11 ++--------- chapter10/grub.xml | 4 ++-- chapter10/kernel.xml | 8 +++----- chapter11/theend.xml | 27 +++++---------------------- prologue/bookinfo.xml | 3 +-- 7 files changed, 15 insertions(+), 47 deletions(-) diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml index 70b9b5e44..3412f0a60 100644 --- a/chapter01/askforhelp.xml +++ b/chapter01/askforhelp.xml @@ -38,9 +38,7 @@ - The version of the book being used (in this case - &version; - &versiond;) + The version of the book being used (in this case &version; The host distribution and version being used to create LFS diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e5645c6fb..b53b5390c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -10,10 +10,7 @@ Changelog - This is version - &version; - &versiond; - of the Linux From Scratch book, dated + 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 mirrors via . diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml index 36af2cfaa..b4eacad1a 100644 --- a/chapter07/cleanup.xml +++ b/chapter07/cleanup.xml @@ -114,12 +114,9 @@ umount $LFS/{sys,proc,run} -cd $LFS +cd $LFS tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz . -cd $LFS -tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz . - Replace $HOME by a directory of your choice if you do not want to have the backup stored in environment variable is not set for the root user, it will destroy your entire host system. YOU ARE WARNED. -cd $LFS +cd $LFS rm -rf ./* tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz -cd $LFS -rm -rf ./* -tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz - Again, double check that the environment has been setup properly and continue building the rest of the system. diff --git a/chapter10/grub.xml b/chapter10/grub.xml index f76605f49..d4013767d 100644 --- a/chapter10/grub.xml +++ b/chapter10/grub.xml @@ -156,8 +156,8 @@ set timeout=5 insmod ext2 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 } EOF diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 1a2861856..1465c3bcf 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -228,7 +228,7 @@ File systems ---> cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version; -cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond; +cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version; System.map is a symbol file for the kernel. It maps the function entry points of every function in the kernel API, @@ -337,8 +337,7 @@ EOF config-&linux-version;, - vmlinuz-&linux-version;-lfs-&version;, - vmlinuz-&linux-version;-lfs-&versiond;, + vmlinuz-&linux-version;-lfs-&version; and System.map-&linux-version; /lib/modules, /usr/share/doc/linux-&linux-version; @@ -360,8 +359,7 @@ EOF - vmlinuz-&linux-version;-lfs-&version; - vmlinuz-&linux-version;-lfs-&versiond; + vmlinuz-&linux-version;-lfs-&version; The engine of the Linux system. When turning on the computer, the kernel is the first part of the operating system that gets loaded. diff --git a/chapter11/theend.xml b/chapter11/theend.xml index 6a5f8ad7a..8470948a3 100644 --- a/chapter11/theend.xml +++ b/chapter11/theend.xml @@ -31,50 +31,33 @@ out which LFS version is installed on the system. Create this file by running: -echo &version; > /etc/lfs-release +echo &version; > /etc/lfs-release -echo &versiond; > /etc/lfs-release - - 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 + 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. The first one shows the status of your new system with respect to the Linux Standards Base (LSB). To create this file, run: -cat > /etc/lsb-release << "EOF" +cat > /etc/lsb-release << "EOF" DISTRIB_ID="Linux From Scratch" DISTRIB_RELEASE="&version;" DISTRIB_CODENAME="<your name here>" DISTRIB_DESCRIPTION="Linux From Scratch" -EOF - -cat > /etc/lsb-release << "EOF" -DISTRIB_ID="Linux From Scratch" -DISTRIB_RELEASE="&versiond;" -DISTRIB_CODENAME="<your name here>" -DISTRIB_DESCRIPTION="Linux From Scratch" EOF The second one contains roughly the same information, and is used by systemd and some graphical desktop environments. To create this file, run: -cat > /etc/os-release << "EOF" +cat > /etc/os-release << "EOF" NAME="Linux From Scratch" VERSION="&version;" ID=lfs PRETTY_NAME="Linux From Scratch &version;" VERSION_CODENAME="<your name here>" -EOF - -cat > /etc/os-release << "EOF" -NAME="Linux From Scratch" -VERSION="&versiond;" -ID=lfs -PRETTY_NAME="Linux From Scratch &versiond;" -VERSION_CODENAME="<your name here>" EOF Be sure to put some sort of customization for the fields diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml index 73d06410d..aec113b20 100644 --- a/prologue/bookinfo.xml +++ b/prologue/bookinfo.xml @@ -7,8 +7,7 @@ Linux From Scratch - Version &version; - Version &versiond; + Version &version; Published &releasedate; -- cgit v1.2.3-54-g00ecf