gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2021-10-15 12:21:18 +02:00
commit 08a636839d
24 changed files with 210 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
lfs-bootscripts-*.tar.xz lfs-bootscripts-*.tar.xz
conditional.ent
version.ent version.ent
appendices/*.script appendices/*.script

2
Makefile
View File

@ -204,7 +204,7 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
$(BASEDIR)/md5sums $(BASEDIR)/md5sums
version: version:
$(Q)./git-version.sh $(Q)./git-version.sh $(REV)
#dump-commands: validate #dump-commands: validate
# @echo "Dumping book commands..." # @echo "Dumping book commands..."

8
chapter01/askforhelp.xml
View File

@ -38,13 +38,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>The version of the book being used (in this case <para>The version of the book being used (in this case &version;<phrase arch="ml_32,ml_x32,ml_all">-multilib</phrase>)</para>
<phrase revision="sysv">&version;</phrase>
<phrase revision="systemd">&versiond;</phrase>)
<phrase arch="default" revision="sysv">&version;</phrase>
<phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
<phrase arch="default" revision="systemd">&versiond;</phrase>
<phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>The host distribution and version being used to create LFS</para> <para>The host distribution and version being used to create LFS</para>

45
chapter01/changelog.xml
View File

@ -10,12 +10,7 @@
<title>Changelog</title> <title>Changelog</title>
<para>This is version <para>This is version &version;<phrase arch="ml_32,ml_x32,ml_all">&version;-multilib</phrase> of the Linux From Scratch book, dated
<phrase arch="default" revision="sysv">&version;</phrase>
<phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
<phrase arch="default" revision="systemd">&versiond;</phrase>
<phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>
of the Linux From Scratch book, dated
&releasedate;. If this book is more than six months old, a newer and better &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 version is probably already available. To find out, please check one of the
mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para> mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para>
@ -44,6 +39,44 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem. appropriate for the entry or if needed the entire day's listitem.
--> -->
<listitem>
<para>2021-10-15</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to vim-8.2.3508. Addresses
<ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to tzdata-2021c. Fixes
<ulink url="&lfs-ticket-root;4934">#4934</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to Python-3.10.0. Fixes
<ulink url="&lfs-ticket-root;4938">#4938</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to Jinja2-3.0.2. Fixes
<ulink url="&lfs-ticket-root;4937">#4937</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.14.12. Fixes
<ulink url="&lfs-ticket-root;4932">#4932</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20211004. Fixes
<ulink url="&lfs-ticket-root;4933">#4933</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bc-5.1.1. Fixes
<ulink url="&lfs-ticket-root;4936">#4936</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to automake-1.16.5. Fixes
<ulink url="&lfs-ticket-root;4935">#4935</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2021-10-01</para> <para>2021-10-01</para>
<itemizedlist> <itemizedlist>

2
chapter01/resources.xml
View File

@ -57,7 +57,7 @@
Relay Chat (IRC). Before using this support, please make sure that your Relay Chat (IRC). Before using this support, please make sure that your
question is not already answered in the LFS FAQ or the mailing list question is not already answered in the LFS FAQ or the mailing list
archives. You can find the IRC network at <uri>irc.libera.chat</uri>. archives. You can find the IRC network at <uri>irc.libera.chat</uri>.
The support channel is named #LFS-support.</para> The support channel is named #lfs-support.</para>
</sect2> </sect2>

8
chapter01/whatsnew.xml
View File

@ -39,9 +39,9 @@
<!--<listitem> <!--<listitem>
<para>Autoconf-&autoconf-version;</para> <para>Autoconf-&autoconf-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Automake-&automake-version;</para> <para>Automake-&automake-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Bash &bash-version;</para> <para>Bash &bash-version;</para>
</listitem>--> </listitem>-->
@ -138,9 +138,9 @@
<listitem> <listitem>
<para>IPRoute2-&iproute2-version;</para> <para>IPRoute2-&iproute2-version;</para>
</listitem> </listitem>
<!--<listitem revision="systemd"> <listitem revision="systemd">
<para>Jinja2-&jinja2-version;</para> <para>Jinja2-&jinja2-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Kbd-&kbd-version;</para> <para>Kbd-&kbd-version;</para>
</listitem>--> </listitem>-->

11
chapter07/cleanup.xml
View File

@ -130,12 +130,9 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen>
</para> </para>
</note> </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> 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> </sect2>
<sect2> <sect2>
@ -160,14 +157,10 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
environment variable is not set for the root user, it will destroy environment variable is not set for the root user, it will destroy
your entire host system. YOU ARE WARNED.</para></warning> your entire host system. YOU ARE WARNED.</para></warning>
<screen role="nodump" revision="sysv"><computeroutput>cd $LFS <screen role="nodump"><computeroutput>cd $LFS
rm -rf ./* rm -rf ./*
tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen> 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> <para>
Again, double check that the environment has been setup properly Again, double check that the environment has been setup properly
and continue building the rest of the system. and continue building the rest of the system.

7
chapter08/automake.xml
View File

@ -58,10 +58,9 @@
the results, issue:</para> the results, issue:</para>
<screen><userinput remap="test">make -j4 check</userinput></screen> <screen><userinput remap="test">make -j4 check</userinput></screen>
<!--
<para>The tests t/subobj.sh, t/deprecated-acinit.sh, and t/init.sh are known to <para>The test t/subobj.sh is known to fail.</para>
fail in the LFS environment.</para>
-->
<para>Install the package:</para> <para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen> <screen><userinput remap="install">make install</userinput></screen>

2
chapter08/gawk.xml
View File

@ -62,7 +62,7 @@
<para>If desired, install the documentation:</para> <para>If desired, install the documentation:</para>
<screen><userinput remap="install">mkdir -v /usr/share/doc/gawk-&gawk-version; <screen><userinput remap="install">mkdir -pv /usr/share/doc/gawk-&gawk-version;
cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen> cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
</sect2> </sect2>

2
chapter08/iproute2.xml
View File

@ -79,7 +79,7 @@ rm -fv man/man8/arpd.8</userinput></screen>
<para>If desired, install the documentation:</para> <para>If desired, install the documentation:</para>
<screen><userinput remap="install">mkdir -v /usr/share/doc/iproute2-&iproute2-version; <screen><userinput remap="install">mkdir -pv /usr/share/doc/iproute2-&iproute2-version;
cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></screen> cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></screen>
</sect2> </sect2>

2
chapter08/kbd.xml
View File

@ -97,7 +97,7 @@ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput></screen>
<para>If desired, install the documentation:</para> <para>If desired, install the documentation:</para>
<screen><userinput remap="install">mkdir -v /usr/share/doc/kbd-&kbd-version; <screen><userinput remap="install">mkdir -pv /usr/share/doc/kbd-&kbd-version;
cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen> cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
</sect2> </sect2>

2
chapter08/ncurses.xml
View File

@ -124,7 +124,7 @@ ln -sfv libncurses.so /usr/lib/libcurses.so</userinput></screen>
<para>If desired, install the Ncurses documentation:</para> <para>If desired, install the Ncurses documentation:</para>
<screen><userinput remap="install">mkdir -v /usr/share/doc/ncurses-&ncurses-version; <screen><userinput remap="install">mkdir -pv /usr/share/doc/ncurses-&ncurses-version;
cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen> cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
<note> <note>

16
chapter10/grub.xml
View File

@ -135,7 +135,7 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></
<para>Generate <filename>/boot/grub/grub.cfg</filename>:</para> <para>Generate <filename>/boot/grub/grub.cfg</filename>:</para>
<screen revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF" <screen><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
<literal># Begin /boot/grub/grub.cfg <literal># Begin /boot/grub/grub.cfg
set default=0 set default=0
set timeout=5 set timeout=5
@ -148,20 +148,6 @@ menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
}</literal> }</literal>
EOF</userinput></screen> EOF</userinput></screen>
<screen revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
<literal># Begin /boot/grub/grub.cfg
set default=0
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
}</literal>
EOF</userinput></screen>
<note><para>From <application>GRUB</application>'s perspective, the <note><para>From <application>GRUB</application>'s perspective, the
kernel files are relative to the partition used. If you kernel files are relative to the partition used. If you
used a separate /boot partition, remove /boot from the above used a separate /boot partition, remove /boot from the above

10
chapter10/kernel.xml
View File

@ -258,9 +258,7 @@ File systems ---&gt;
the automatic setup of the boot process described in the next section. The the automatic setup of the boot process described in the next section. The
following command assumes an x86 architecture:</para> following command assumes an x86 architecture:</para>
<screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen> <screen><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>
<para><filename>System.map</filename> is a symbol file for the kernel. <para><filename>System.map</filename> is a symbol file for the kernel.
It maps the function entry points of every function in the kernel API, It maps the function entry points of every function in the kernel API,
@ -369,8 +367,7 @@ EOF</userinput></screen>
<seglistitem> <seglistitem>
<seg>config-&linux-version;, <seg>config-&linux-version;,
<phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase> vmlinuz-&linux-version;-lfs-&version;,
<phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
and System.map-&linux-version;</seg> and System.map-&linux-version;</seg>
<seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg> <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
</seglistitem> </seglistitem>
@ -392,8 +389,7 @@ EOF</userinput></screen>
</varlistentry> </varlistentry>
<varlistentry id="lfskernel"> <varlistentry id="lfskernel">
<term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term> <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
<term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
<listitem> <listitem>
<para>The engine of the Linux system. When turning on the computer, <para>The engine of the Linux system. When turning on the computer,
the kernel is the first part of the operating system that gets loaded. the kernel is the first part of the operating system that gets loaded.

37
chapter11/reboot.xml
View File

@ -20,22 +20,19 @@
<itemizedlist> <itemizedlist>
<listitem><para>A text mode browser such as <ulink revision="sysv" <listitem><para>A text mode browser such as <ulink
url='&blfs-book;basicnet/lynx.html'>Lynx</ulink><ulink revision="systemd" url='&blfs-book;basicnet/lynx.html'>Lynx</ulink>
url='&blfs-systemd-book;basicnet/lynx.html'>Lynx</ulink>
will allow you to easily view the BLFS book in one virtual terminal, while will allow you to easily view the BLFS book in one virtual terminal, while
building packages in another.</para></listitem> building packages in another.</para></listitem>
<listitem><para>The <ulink revision="sysv" <listitem><para>The <ulink
url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink><ulink revision="systemd" url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
url='&blfs-systemd-book;postlfs/make-ca.html'>make-ca</ulink> package
will allow you to set up local trusted anchor certificates, allowing will allow you to set up local trusted anchor certificates, allowing
the system to verify SSL certificates provided by remote servers (for the system to verify SSL certificates provided by remote servers (for
example, a website using HTTPS).</para></listitem> example, a website using HTTPS).</para></listitem>
<listitem><para>The <ulink revision="sysv" <listitem><para>The <ulink
url='&blfs-book;general/gpm.html'>GPM</ulink><ulink revision="systemd" url='&blfs-book;general/gpm.html'>GPM</ulink> package will allow
url='&blfs-systemd-book;general/gpm.html'>GPM</ulink> package will allow
you to perform copy/paste actions in your virtual you to perform copy/paste actions in your virtual
terminals.</para></listitem> terminals.</para></listitem>
@ -47,29 +44,21 @@
url='&blfs-book;basicnet/dhcp.html'>dhcp</ulink> may be url='&blfs-book;basicnet/dhcp.html'>dhcp</ulink> may be
useful.</para></listitem> useful.</para></listitem>
<listitem><para>Installing <ulink revision="sysv" <listitem><para>Installing <ulink
url='&blfs-book;postlfs/sudo.html'>sudo</ulink><ulink revision="systemd" url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
url='&blfs-systemd-book;postlfs/sudo.html'>sudo</ulink> may be useful for
building packages as a non-root user and easily installing the resulting building packages as a non-root user and easily installing the resulting
packages in your new system.</para></listitem> packages in your new system.</para></listitem>
<listitem><para>If you want to access your new system from a remote system <listitem><para>If you want to access your new system from a remote system
within a comfortable GUI environment, install <ulink revision="sysv" within a comfortable GUI environment, install <ulink
url='&blfs-book;postlfs/openssh.html'>openssh</ulink><ulink revision="systemd" url='&blfs-book;postlfs/openssh.html'>openssh</ulink>.</para></listitem>
url='&blfs-systemd-book;postlfs/openssh.html'>openssh</ulink>.
</para></listitem>
<listitem><para>To make fetching files over the internet easier, install <listitem><para>To make fetching files over the internet easier, install
<ulink <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.</para></listitem>
revision="sysv" url='&blfs-book;basicnet/wget.html'>wget</ulink><ulink
revision="systemd" url='&blfs-systemd-book;basicnet/wget.html'>wget</ulink>.
</para></listitem>
<listitem><para>To connect to a wireless access point for networking, <listitem><para>To connect to a wireless access point for networking,
install <ulink revision="sysv" install <ulink
url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink><ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
revision="systemd"
url='&blfs-systemd-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
</para></listitem> </para></listitem>
<listitem><para>Finally, a review of the following configuration files <listitem><para>Finally, a review of the following configuration files

27
chapter11/theend.xml
View File

@ -31,50 +31,33 @@
out which LFS version is installed on the system. Create this file by out which LFS version is installed on the system. Create this file by
running:</para> 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> them.</para>
<para>The first one shows the status of your <para>The first one shows the status of your
new system with respect to the Linux Standards Base (LSB). To create new system with respect to the Linux Standards Base (LSB). To create
this file, run:</para> 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_ID="Linux From Scratch"
DISTRIB_RELEASE="&version;" DISTRIB_RELEASE="&version;"
DISTRIB_CODENAME="&lt;your name here&gt;" DISTRIB_CODENAME="&lt;your name here&gt;"
DISTRIB_DESCRIPTION="Linux From Scratch" 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"
EOF</userinput></screen> EOF</userinput></screen>
<para>The second one contains roughly the same information, and is used <para>The second one contains roughly the same information, and is used
by systemd and some graphical desktop environments. To create by systemd and some graphical desktop environments. To create
this file, run:</para> 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" NAME="Linux From Scratch"
VERSION="&version;" VERSION="&version;"
ID=lfs ID=lfs
PRETTY_NAME="Linux From Scratch &version;" PRETTY_NAME="Linux From Scratch &version;"
VERSION_CODENAME="&lt;your name here&gt;" 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> EOF</userinput></screen>
<para>Be sure to put some sort of customization for the fields <para>Be sure to put some sort of customization for the fields

3
chapter11/whatnow.xml
View File

@ -57,8 +57,7 @@
<para>The Beyond Linux From Scratch book covers installation <para>The Beyond Linux From Scratch book covers installation
procedures for a wide range of software beyond the scope of the LFS procedures for a wide range of software beyond the scope of the LFS
Book. The BLFS project is located at <ulink revision="sysv" Book. The BLFS project is located at <ulink url="&blfs-book;"/>.
url="&blfs-book;"/><ulink revision="systemd" url="&blfs-systemd-book;"/>.
</para> </para>
</listitem> </listitem>

92
general.ent
View File

@ -1,44 +1,96 @@
<!-- version info automatically generated by git <!-- Editing up to the line of ==== should be enough
comment the following two lines for release --> 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;
<![ %development; [
<!-- version info automatically generated by git -->
<!ENTITY % version-entities SYSTEM "version.ent"> <!ENTITY % version-entities SYSTEM "version.ent">
%version-entities; %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 <![ %release; [
for releases (including -rc) --> <![ %sysv; [
<!-- <!ENTITY version "%relnum;">
<!ENTITY version "10.2-rc1"> <!ENTITY short-version "%relnum;"> <!-- Used below in &blfs-book; -->
<!ENTITY versiond "10.2-systemd-rc1"> ]]>
<!ENTITY releasedate "August 26th, 2021"> <![ %systemd; [
<!ENTITY copyrightdate "1999-2021"> <!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 short-version "svn"> <!-- Used below in &blfs-book; <![ %rc; [
Change to x.y for release but not -rc releases --> <![ %sysv; [
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> <!ENTITY version "%relnum;-rc%rcnum;">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; -->
<!ENTITY short-versiond "systemd"> <!--Change to stable-systemd for release --> ]]>
<!ENTITY generic-versiond "systemd"> <![ %systemd; [
<!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 lfs-root "https://www.linuxfromscratch.org/"> <!ENTITY lfs-root "https://www.linuxfromscratch.org/">
<!ENTITY blfs-root "&lfs-root;blfs/"> <!ENTITY blfs-root "&lfs-root;blfs/">
<!ENTITY blfs-book "&blfs-root;view/&short-version;/"> <!ENTITY blfs-book "&blfs-root;view/&short-version;/">
<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
<!ENTITY faq-root "&lfs-root;faq/"> <!ENTITY faq-root "&lfs-root;faq/">
<!ENTITY hints-root "&lfs-root;hints/downloads/files/"> <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
<!ENTITY hints-index "&lfs-root;hints/list.html"> <!ENTITY hints-index "&lfs-root;hints/list.html">
<!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/"> <!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 downloads-root "&lfs-root;lfs/downloads/&generic-version;/">
<!ENTITY livecd-root "&lfs-root;livecd/"> <!ENTITY livecd-root "&lfs-root;livecd/">
<!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/"> <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
<!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
<!ENTITY secadv "&lfs-root;lfs/advisories/"> <!ENTITY secadv "&lfs-root;lfs/advisories/">
<!ENTITY min-kernel "3.2"> <!ENTITY min-kernel "3.2">
<!--
<!ENTITY patches-rootd "&lfs-root;patches/lfs/&generic-versiond;/"> <!ENTITY patches-rootd "&lfs-root;patches/lfs/&generic-versiond;/">
<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/"> <!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
<!ENTITY test-resultsd "&lfs-root;lfs/build-logs/&generic-versiond;/"> <!ENTITY test-resultsd "&lfs-root;lfs/build-logs/&generic-versiond;/">
<!ENTITY erratad "&lfs-root;lfs/errata/&generic-versiond;/"> <!ENTITY erratad "&lfs-root;lfs/errata/&generic-versiond;/">
-->
<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/"> <!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
<!ENTITY anduin-sources "https://anduin.linuxfromscratch.org/LFS"> <!ENTITY anduin-sources "https://anduin.linuxfromscratch.org/LFS">

38
git-version.sh
View File

@ -1,10 +1,28 @@
#!/bin/sh #!/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 "<!ENTITY % sysv \"$SYSV\">" > conditional.ent
echo "<!ENTITY % systemd \"$SYSTEMD\">" >> conditional.ent
if ! git status > /dev/null; then if ! git status > /dev/null; then
# Either it's not a git repository, or git is unavaliable. # Either it's not a git repository, or git is unavaliable.
# Just workaround. # Just workaround.
echo "<!ENTITY version \"unknown\">" > version.ent echo "<![ %sysv; [" > version.ent
echo "<!ENTITY versiond \"unknown-systemd\">" >> version.ent echo "<!ENTITY version \"unknown\">" >> version.ent
echo "]]>" >> version.ent
echo "<![ %systemd; [" >> version.ent
echo "<!ENTITY version \"unknown-systemd\">" >> version.ent
echo "]]>" >> version.ent
echo "<!ENTITY releasedate \"unknown\">" >> version.ent echo "<!ENTITY releasedate \"unknown\">" >> version.ent
echo "<!ENTITY copyrightdate \"1999-2021\">" >> version.ent echo "<!ENTITY copyrightdate \"1999-2021\">" >> version.ent
exit 0 exit 0
@ -30,18 +48,20 @@ esac
full_date="$month $day$suffix, $year" full_date="$month $day$suffix, $year"
sha="$(git describe --abbrev=1)" sha="$(git describe --abbrev=1)"
if [ "$(git branch --show-current)" = "trunk" ]; then rev=$(echo "$sha" | sed 's/-g[^-]*$//')
sha=$(echo "$sha" | sed 's/-g[^-]*$//') version="$rev"
fi versiond="$rev-systemd"
version="$sha"
versiond="$sha-systemd"
if [ "$(git diff HEAD | wc -l)" != "0" ]; then if [ "$(git diff HEAD | wc -l)" != "0" ]; then
version="$version+" version="$version+"
versiond="$versiond+" versiond="$versiond+"
fi fi
echo "<!ENTITY version \"$version\">" > version.ent echo "<![ %sysv; [" > version.ent
echo "<!ENTITY versiond \"$versiond\">" >> version.ent echo "<!ENTITY version \"$version\">" >> version.ent
echo "]]>" >> version.ent
echo "<![ %systemd; [" >> version.ent
echo "<!ENTITY version \"$versiond\">" >> version.ent
echo "]]>" >> version.ent
echo "<!ENTITY releasedate \"$full_date\">" >> version.ent echo "<!ENTITY releasedate \"$full_date\">" >> version.ent
echo "<!ENTITY copyrightdate \"1999-$year\">" >> version.ent echo "<!ENTITY copyrightdate \"1999-$year\">" >> version.ent

2
lfs-latest-git.php
View File

@ -318,7 +318,7 @@ function get_current()
# Make version.ent # Make version.ent
chdir( "$tmpdir/LFS" ); chdir( "$tmpdir/LFS" );
exec ( "./git-version.sh" ); exec ( "./git-version.sh systemd" );
chdir( $cdir ); chdir( $cdir );

2
make-aux-files.sh
View File

@ -3,7 +3,7 @@
rm -f lfs-bootscripts*.tar.?z* rm -f lfs-bootscripts*.tar.?z*
# Get base file name and move bootscripts directory to that name # 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 mv bootscripts lfs-bootscripts-$version
# Create the tarball and clean up # Create the tarball and clean up

52
packages.ent
View File

@ -38,11 +38,11 @@
<!ENTITY autoconf-fin-sbu-tests "7.3"> <!ENTITY autoconf-fin-sbu-tests "7.3">
<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)"> <!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
<!ENTITY automake-version "1.16.4"> <!ENTITY automake-version "1.16.5">
<!ENTITY am-minor-version "1.16"> <!ENTITY am-minor-version "1.16">
<!ENTITY automake-size "1,564 KB"> <!ENTITY automake-size "1,565 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz"> <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
<!ENTITY automake-md5 "86e8e682bd74e6390a016c4d9c11267c"> <!ENTITY automake-md5 "4017e96f89fca45ca946f1c5db6be714">
<!ENTITY automake-sha256 "80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d"> <!ENTITY automake-sha256 "80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d">
<!ENTITY automake-home "&gnu-software;automake/"> <!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-fin-du "115 MB"> <!ENTITY automake-fin-du "115 MB">
@ -58,10 +58,10 @@
<!ENTITY bash-fin-du "50 MB"> <!ENTITY bash-fin-du "50 MB">
<!ENTITY bash-fin-sbu "1.6 SBU"> <!ENTITY bash-fin-sbu "1.6 SBU">
<!ENTITY bc-version "5.0.2"> <!ENTITY bc-version "5.1.1">
<!ENTITY bc-size "420 KB"> <!ENTITY bc-size "424 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz"> <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "3b521d29aa4af4c4d5e96f7c3db3c607"> <!ENTITY bc-md5 "1af1e124e5d1734e8770dc85e0af5cd6">
<!ENTITY bc-home "https://git.yzena.com/gavin/bc"> <!ENTITY bc-home "https://git.yzena.com/gavin/bc">
<!ENTITY bc-fin-du "6.7 MB"> <!ENTITY bc-fin-du "6.7 MB">
<!ENTITY bc-fin-sbu "less than 0.1 SBU"> <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@ -321,10 +321,10 @@
<!ENTITY gzip-fin-du "19 MB"> <!ENTITY gzip-fin-du "19 MB">
<!ENTITY gzip-fin-sbu "0.1 SBU"> <!ENTITY gzip-fin-sbu "0.1 SBU">
<!ENTITY iana-etc-version "20210924"> <!ENTITY iana-etc-version "20211004">
<!ENTITY iana-etc-size "580 KB"> <!ENTITY iana-etc-size "580 KB">
<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz"> <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
<!ENTITY iana-etc-md5 "e4e8ab089948c1cbb2f9003087fa2ac7"> <!ENTITY iana-etc-md5 "7f174923f490329e2665ded727b1cc5c">
<!ENTITY iana-etc-home "https://www.iana.org/protocols"> <!ENTITY iana-etc-home "https://www.iana.org/protocols">
<!ENTITY iana-etc-fin-du "4.7 MB"> <!ENTITY iana-etc-fin-du "4.7 MB">
<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU"> <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@ -362,10 +362,10 @@
<!ENTITY isl-fin-du "20 MB"> <!ENTITY isl-fin-du "20 MB">
<!ENTITY isl-fin-sbu "0.1 SBU"> <!ENTITY isl-fin-sbu "0.1 SBU">
<!ENTITY jinja2-version "3.0.1"> <!ENTITY jinja2-version "3.0.2">
<!ENTITY jinja2-size "264 KB"> <!ENTITY jinja2-size "263 KB">
<!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz"> <!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
<!ENTITY jinja2-md5 "25ba6ef98c164878acff1036fbd72a1d"> <!ENTITY jinja2-md5 "059f89375d7ea60eb7013f341f0b89e7">
<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/"> <!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
<!ENTITY jinja2-fin-du "3.7 MB"> <!ENTITY jinja2-fin-du "3.7 MB">
<!ENTITY jinja2-fin-sbu "less than 0.1 SBU"> <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
@ -436,12 +436,12 @@
<!ENTITY linux-major-version "5"> <!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "14"> <!ENTITY linux-minor-version "14">
<!ENTITY linux-patch-version "8"> <!ENTITY linux-patch-version "12">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "117,869 KB"> <!ENTITY linux-size "117,880 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "ce6434b646ade20e292fb28c1aacde58"> <!ENTITY linux-md5 "a52286fe206a3f7664ca5a6c5995b9ed">
<!ENTITY linux-home "https://www.kernel.org/"> <!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
allnoconfig rounded down to allow for ongoing cleanups, allnoconfig rounded down to allow for ongoing cleanups,
@ -600,19 +600,19 @@
<!-- If python minor version changes, updates in python and <!-- If python minor version changes, updates in python and
meson pages will be needed: python3.6 and python3.6m --> meson pages will be needed: python3.6 and python3.6m -->
<!ENTITY python-version "3.9.7"> <!ENTITY python-version "3.10.0">
<!ENTITY python-minor "3.9"> <!ENTITY python-minor "3.10">
<!ENTITY python-size "18,676 KB"> <!ENTITY python-size "18,288 KB">
<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz"> <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
<!ENTITY python-md5 "fddb060b483bc01850a3f412eea1d954"> <!ENTITY python-md5 "3e7035d272680f80e3ce4e8eb492d580">
<!ENTITY python-home "https://www.python.org/"> <!ENTITY python-home "https://www.python.org/">
<!ENTITY python-tmp-du "347 MB"> <!ENTITY python-tmp-du "347 MB">
<!ENTITY python-tmp-sbu "1.2 SBU"> <!ENTITY python-tmp-sbu "1.2 SBU">
<!ENTITY python-fin-du "260 MB"> <!ENTITY python-fin-du "260 MB">
<!ENTITY python-fin-sbu "4.4 SBU"> <!ENTITY python-fin-sbu "4.4 SBU">
<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2"> <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
<!ENTITY python-docs-md5 "ef3ea6141ed362e4d12467b136ee70fe"> <!ENTITY python-docs-md5 "157696412c0abede82024c91ec22f562">
<!ENTITY python-docs-size "6,791 KB"> <!ENTITY python-docs-size "7,093 KB">
<!ENTITY readline-version "8.1"> <!ENTITY readline-version "8.1">
<!ENTITY readline-size "2,924 KB"> <!ENTITY readline-size "2,924 KB">
@ -705,10 +705,10 @@
<!ENTITY texinfo-fin-du "112 MB"> <!ENTITY texinfo-fin-du "112 MB">
<!ENTITY texinfo-fin-sbu "0.6 SBU"> <!ENTITY texinfo-fin-sbu "0.6 SBU">
<!ENTITY tzdata-version "2021b"> <!ENTITY tzdata-version "2021c">
<!ENTITY tzdata-size "411 KB"> <!ENTITY tzdata-size "412 KB">
<!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz"> <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
<!ENTITY tzdata-md5 "f3b7d5040127e45ccd7ef0952e03edb2"> <!ENTITY tzdata-md5 "8c0ffa5162bca86eaa5ba1b4aec1a0fc">
<!ENTITY tzdata-home "https://www.iana.org/time-zones"> <!ENTITY tzdata-home "https://www.iana.org/time-zones">
<!ENTITY udev-lfs-version "udev-lfs-20171102"> <!ENTITY udev-lfs-version "udev-lfs-20171102">
@ -728,13 +728,13 @@
<!ENTITY util-linux-fin-du "261 MB"> <!ENTITY util-linux-fin-du "261 MB">
<!ENTITY util-linux-fin-sbu "1.1 SBU"> <!ENTITY util-linux-fin-sbu "1.1 SBU">
<!ENTITY vim-version "8.2.3458"> <!ENTITY vim-version "8.2.3508">
<!ENTITY vim-majmin "82"> <!ENTITY vim-majmin "82">
<!ENTITY vim-docdir "vim/vim82"> <!ENTITY vim-docdir "vim/vim82">
<!ENTITY vim-size "15,360 KB"> <!ENTITY vim-size "15,386 KB">
<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">--> <!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz"> <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
<!ENTITY vim-md5 "29bdddab2dc2f6e10b2badba4ffad4bf"> <!ENTITY vim-md5 "f6004d3e776040e2301a1967975d00d1">
<!ENTITY vim-home "https://www.vim.org"> <!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "199 MB"> <!ENTITY vim-fin-du "199 MB">
<!ENTITY vim-fin-sbu "2.3 SBU"> <!ENTITY vim-fin-sbu "2.3 SBU">

5
prologue/bookinfo.xml
View File

@ -7,10 +7,7 @@
<bookinfo> <bookinfo>
<title>Linux From Scratch</title> <title>Linux From Scratch</title>
<subtitle arch="default" revision='sysv'>Version &version;</subtitle> <subtitle>Version &version;<phrase arch="ml_32,ml_x32,ml_all">-multilib</phrase></subtitle>
<subtitle arch="default" revision='systemd'>Version &versiond;</subtitle>
<subtitle arch="ml_32,ml_x32,ml_all" revision='sysv'>Version &version;-multilib</subtitle>
<subtitle arch="ml_32,ml_x32,ml_all" revision='systemd'>Version &versiond;-multilib</subtitle>
<subtitle>Published &releasedate;</subtitle> <subtitle>Published &releasedate;</subtitle>
<authorgroup> <authorgroup>

3
prologue/errata.xml
View File

@ -15,8 +15,7 @@
the LFS book has been released. To check whether the package versions or the LFS book has been released. To check whether the package versions or
instructions in this release of LFS need any modifications to accommodate instructions in this release of LFS need any modifications to accommodate
security vulnerabilities or other bug fixes, please visit security vulnerabilities or other bug fixes, please visit
<ulink revision="sysv" url="&errata;"/> <ulink url="&errata;"/>
<ulink revision="systemd" url="&erratad;"/>
before proceeding with your build. You should note any before proceeding with your build. You should note any
changes shown and apply them to the relevant section of the book as you changes shown and apply them to the relevant section of the book as you
progress with building the LFS system.</para> progress with building the LFS system.</para>