From bd90b9b7476860532e8ee3d8e16bc848846e1f5d Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 11:08:49 +0200 Subject: Add a conditional entity for sysv/systemd This removes the need for versiond, and other xxxd entities. Those entities will be removed in the next commits. --- .gitignore | 1 + Makefile | 2 +- general.ent | 27 +++++++++++++++++++-------- git-version.sh | 30 ++++++++++++++++++++++++++---- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e5fb52276..0d2478625 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ lfs-bootscripts-*.tar.xz +conditional.ent version.ent appendices/*.script diff --git a/Makefile b/Makefile index be9c522f3..f4a74e67a 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ $(BASEDIR)/md5sums version: - $(Q)./git-version.sh + $(Q)./git-version.sh $(REV) #dump-commands: validate # @echo "Dumping book commands..." diff --git a/general.ent b/general.ent index 4c7e25795..fb8e9e79b 100644 --- a/general.ent +++ b/general.ent @@ -1,29 +1,40 @@ + + +%conditional-entities; + + comment out the following two lines for release --> %version-entities; + - - - +]]> + + +]]> - + @@ -34,12 +45,12 @@ - + diff --git a/git-version.sh b/git-version.sh index ff0eb6cdd..8f5cdb33b 100755 --- a/git-version.sh +++ b/git-version.sh @@ -1,10 +1,28 @@ #!/bin/sh +if [ "$1" = sysv ]; then + SYSV="INCLUDE" + SYSTEMD="IGNORE " +elif [ "$1" = systemd ]; then + SYSV="IGNORE " + SYSTEMD="INCLUDE" +else + echo You must provide either \"sysv\" or \"systemd\" as argument + exit 1 +fi + +echo "" > conditional.ent +echo "" >> conditional.ent + if ! git status > /dev/null; then # Either it's not a git repository, or git is unavaliable. # Just workaround. - echo "" > version.ent - echo "" >> version.ent + echo " version.ent + echo "" >> version.ent + echo "]]>" >> version.ent + echo "> version.ent + echo "" >> version.ent + echo "]]>" >> version.ent echo "" >> version.ent echo "" >> version.ent exit 0 @@ -41,7 +59,11 @@ if [ "$(git diff HEAD | wc -l)" != "0" ]; then versiond="$versiond+" fi -echo "" > version.ent -echo "" >> version.ent +echo " version.ent +echo "" >> version.ent +echo "]]>" >> version.ent +echo "> version.ent +echo "" >> version.ent +echo "]]>" >> version.ent echo "" >> version.ent echo "" >> version.ent -- cgit v1.2.3-54-g00ecf 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 From b713ddb7840855750669e77c0f8345915402f789 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 11:22:25 +0200 Subject: remove blfs-systemd-book entity in chapter 11 --- chapter11/reboot.xml | 36 +++++++++++++----------------------- chapter11/whatnow.xml | 3 +-- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml index 3a4616e63..adf1a9f3e 100644 --- a/chapter11/reboot.xml +++ b/chapter11/reboot.xml @@ -20,22 +20,19 @@ - A text mode browser such as LynxLynx + A text mode browser such as Lynx will allow you to easily view the BLFS book in one virtual terminal, while building packages in another. - The make-camake-ca package + The make-ca package will allow you to set up local trusted anchor certificates, allowing the system to verify SSL certificates provided by remote servers (for example, a website using HTTPS). - The GPMGPM package will allow + The GPM package will allow you to perform copy/paste actions in your virtual terminals. @@ -47,28 +44,21 @@ url='&blfs-book;basicnet/dhcp.html'>dhcp may be useful. - Installing sudosudo may be useful for + Installing sudo may be useful for building packages as a non-root user and easily installing the resulting packages in your new system. If you want to access your new system from a remote system - within a comfortable GUI environment, install opensshopenssh. - + within a comfortable GUI environment, install openssh. To make fetching files over the internet easier, install - wget - wget. - + wget. To connect to a wireless access point for networking, - install wpa_supplicantwpa_supplicant. + install wpa_supplicant. Finally, a review of the following configuration files diff --git a/chapter11/whatnow.xml b/chapter11/whatnow.xml index e72f4ca5e..f8672ec69 100644 --- a/chapter11/whatnow.xml +++ b/chapter11/whatnow.xml @@ -57,8 +57,7 @@ The Beyond Linux From Scratch book covers installation procedures for a wide range of software beyond the scope of the LFS - Book. The BLFS project is located at . + Book. The BLFS project is located at . -- cgit v1.2.3-54-g00ecf From 4429e8fbbb2b00df14ebb5fa4e7d41d5fdff51b5 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 11:44:54 +0200 Subject: Remove a duplicated entity in general.ent --- general.ent | 1 - 1 file changed, 1 deletion(-) diff --git a/general.ent b/general.ent index fb8e9e79b..4f63bce13 100644 --- a/general.ent +++ b/general.ent @@ -34,7 +34,6 @@ - -- cgit v1.2.3-54-g00ecf From 0f8ec0945bff48dcc079f98e1d27a5da71409926 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 11:45:28 +0200 Subject: remove erratad entity --- prologue/errata.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prologue/errata.xml b/prologue/errata.xml index 2ecf71555..fa919bcca 100644 --- a/prologue/errata.xml +++ b/prologue/errata.xml @@ -15,8 +15,7 @@ the LFS book has been released. To check whether the package versions or instructions in this release of LFS need any modifications to accommodate security vulnerabilities or other bug fixes, please visit - - + before proceeding with your build. You should note any changes shown and apply them to the relevant section of the book as you progress with building the LFS system. -- cgit v1.2.3-54-g00ecf From 900cbccdea6d41b077823897f6a7a437b0b583dc Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 14:38:08 +0200 Subject: Make generic-version the same on both books Needs to make a conditional for errata --- general.ent | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/general.ent b/general.ent index 4f63bce13..75464eee7 100644 --- a/general.ent +++ b/general.ent @@ -24,12 +24,11 @@ - ]]> - ]]> + @@ -41,7 +40,12 @@ + +]]> + +]]> @@ -393,6 +429,17 @@ +]]> + + + + + + + + +]]> @@ -483,6 +530,7 @@ + @@ -490,6 +538,17 @@ +]]> + + + + + + + + +]]> @@ -632,6 +691,7 @@ + @@ -639,7 +699,19 @@ - +]]> + + + + + + + + +]]> + + -- cgit v1.2.3-54-g00ecf From 74bc5473c3745fa8947b0151b3bd951542b28286 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 16:53:14 +0200 Subject: Fix make-aux-file for lfs-bootscript entities now, grep returns two lines. Keep only the first one, and add a comment in packages;ent so that the first line is the one we want! --- make-aux-files.sh | 2 +- packages.ent | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/make-aux-files.sh b/make-aux-files.sh index ad8bcea6f..9cb1adbff 100755 --- a/make-aux-files.sh +++ b/make-aux-files.sh @@ -3,7 +3,7 @@ rm -f lfs-bootscripts*.tar.?z* # Get base file name and move bootscripts directory to that name -version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2` +version=`grep "ENTITY lfs-bootscripts-version" packages.ent | head -n1| cut -d'"' -f2` mv bootscripts lfs-bootscripts-$version # Create the tarball and clean up diff --git a/packages.ent b/packages.ent index f710b8e50..db17e9afc 100644 --- a/packages.ent +++ b/packages.ent @@ -421,6 +421,10 @@ + -- cgit v1.2.3-54-g00ecf From 9bfd0b53f4bcc578dcc6b192457d29c670a94e28 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 16:55:01 +0200 Subject: Add conditional for patches only in one book Same logic as for pacakges.ent, see preceding commits --- patches.ent | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/patches.ent b/patches.ent index e1700857a..07f8f154a 100644 --- a/patches.ent +++ b/patches.ent @@ -68,10 +68,26 @@ + +]]> + + + +]]> + + +]]> + + + + +]]> -- cgit v1.2.3-54-g00ecf From df1207e0fb2613f19cb89b8c2bddf24b72e1ec6a Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 1 Sep 2021 17:07:07 +0200 Subject: packages.ent: remove a double hyphen in a comment --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index db17e9afc..94353f1d9 100644 --- a/packages.ent +++ b/packages.ent @@ -422,7 +422,7 @@ Date: Wed, 15 Sep 2021 09:54:13 +0200 Subject: Remove eol spaces not caught by merge --- chapter07/cleanup.xml | 6 +++--- general.ent | 2 +- packages.ent | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml index c50c65f06..ad5d96992 100644 --- a/chapter07/cleanup.xml +++ b/chapter07/cleanup.xml @@ -127,7 +127,7 @@ umount $LFS/{sys,proc,run,dev} -cd $LFS +cd $LFS tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz . @@ -154,8 +154,8 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz . environment variable is not set for the root user, it will destroy your entire host system. YOU ARE WARNED. -cd $LFS -rm -rf ./* +cd $LFS +rm -rf ./* tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz diff --git a/general.ent b/general.ent index 137b0cf36..b3526641e 100644 --- a/general.ent +++ b/general.ent @@ -22,7 +22,7 @@ ]]> - + - + - + ]]> -- cgit v1.2.3-54-g00ecf From 3c5b3f98c3a86e991de24def2e058f9b8045f3b5 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Thu, 16 Sep 2021 09:32:18 +0200 Subject: Remove conditionals in packages.ent This allows to generate the same consolidated wget-list for both books, which is needed for currency scripts --- packages.ent | 117 +---------------------------------------------------------- 1 file changed, 2 insertions(+), 115 deletions(-) diff --git a/packages.ent b/packages.ent index 99645f817..d89c301cd 100644 --- a/packages.ent +++ b/packages.ent @@ -114,7 +114,6 @@ - @@ -122,17 +121,6 @@ -]]> - - - - - - - - -]]> @@ -168,23 +156,12 @@ - -]]> - - - - - - - -]]> @@ -377,7 +354,6 @@ - @@ -385,17 +361,6 @@ -]]> - - - - - - - - -]]> @@ -421,11 +386,6 @@ - - @@ -433,17 +393,6 @@ -]]> - - - - - - - - -]]> @@ -534,7 +483,6 @@ - @@ -542,17 +490,6 @@ -]]> - - - - - - - - -]]> @@ -695,7 +632,6 @@ - @@ -703,19 +639,7 @@ -]]> - - - - - - - - -]]> - - -- cgit v1.2.3-54-g00ecf