Merge remote-tracking branch 'origin/trunk' into xry111/arm64

This commit is contained in:
Xi Ruoyao 2024-08-29 14:17:58 +08:00
commit f4f58d4368
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
25 changed files with 97 additions and 43 deletions

View File

@ -15,7 +15,7 @@ base=$(basename $bootscripts .tar.xz)
bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ")
bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")
# Figure intalled size of bootscripts
# Figure installed size of bootscripts
TOPDIR=$(pwd)
TMP_DIR=$(mktemp -d /tmp/lfsbootfiles.XXXXXX)
pushd $TMP_DIR > /dev/null

View File

@ -1,3 +1,10 @@
2024-08-25 Xi Ruoyao <xry111@xry111.site>
* Remove an empty line and an outdated comment (not valid anymore after
/usr merge) from init-functions.
2024-08-24 Andrew Kreimer <algonell@gmail.com>
* Fix typos.
2024-08-23 Xi Ruoyao <xry111@xry111.site>
* In console, detect FB console by checking /sys/class/graphics/fbcon
instead of fb0. The latter does not exist if CONFIG_FB=n, but

View File

@ -457,11 +457,8 @@ pidofproc()
# If a PID file is set and exists, use it.
if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
# Use the value in the first line of the pidfile
pidlist=`/bin/head -n1 "${pidfile}"`
# This can optionally be written as 'sed 1q' to repalce 'head -n1'
# should LFS move /bin/head to /usr/bin/head
else
# Use pidof
pidlist=`pidof "${program}"`

View File

@ -94,7 +94,7 @@ NOTES
compound device such as a bridge.
ONBOOT - If set to 'yes', the specified interface is
configured by the netowrk boot script.
configured by the network boot script.
GATEWAY - The default IP address to use for routing if
the destination IP address is not in a static
@ -112,7 +112,7 @@ NOTES
This list is normally a single value, e.g. eth0,
for use with a virtual host such as kvm.
Other paramters that are service specific include:
Other parameters that are service specific include:
ipv4-static
@ -128,7 +128,7 @@ NOTES
additional IP addresses to a network
device. Example: eth0:2 (optional)
BROADCAST - The brodcast address for this interface,
BROADCAST - The broadcast address for this interface,
e.g 192.168.1.255. If not specified,
the broadcast address will be calculated
from the IP and PREFIX.
@ -154,7 +154,7 @@ NOTES
DHCP_START - Optional parameters to pass to the dhcp client
at startup.
DHCP_STOP - Optional paremeters to pass to the dhcp client
DHCP_STOP - Optional parameters to pass to the dhcp client
at shutdown.
PRINTIP - Flag to print the dhcp address to stdout

View File

@ -40,6 +40,16 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2024-08-23</para>
<itemizedlist>
<listitem>
<para>[xry111] - Update to lfs-bootscripts-20240825. Only trivial
non-functional changes.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2024-08-23</para>
<itemizedlist>

View File

@ -26,9 +26,9 @@
unit of time.</para>
<para>For example, consider a package whose compilation time is 4.5
SBUs. This means that if your system took 10 minutes to compile and
SBUs. This means that if your system took 4 minutes to compile and
install the first pass of binutils, it will take
<emphasis>approximately</emphasis> 45 minutes to build the example package.
<emphasis>approximately</emphasis> 18 minutes to build the example package.
Fortunately, most build times are shorter than one SBU.</para>
<para>SBUs are not entirely accurate because they depend on many
@ -36,6 +36,36 @@
to give an estimate of how long it might take to install a package, but the
numbers can vary by as much as dozens of minutes in some cases.</para>
<para>On some newer systems, the motherboard is capable of contolling
the system clock speed. This can be controlled with a command such as
<command>powerprofilesctl</command>. This is not available in LFS, but
may be available on the host distro. After LFS is complete, it can be
added to a system with the procedures at the
<ulink url='&blfs-book;sysutils/power-profiles-daemon.html'>
BLFS power-profiles-daemon</ulink> page.
Before measuring the build time of any package it is advisable to use a
system power profile set for maximum performance (and maximum power
consumption).
Otherwise the measured SBU value may be inaccurate because the
system may react differently when building <xref linkend='ch-tools-binutils-pass1'/>
or other packages.
Be aware that a significant inaccuracy can still show up even if the same
profile is used for both packages because the system may respond slower if
the system is idle when starting the build procedure. Setting the power
profile to <quote>performance</quote> will minimize this problem. And
obviously doing so will also make the system build LFS faster.</para>
<para>If <command>powerprofilesctl</command> is available, issue the
<command>powerprofilesctl set performance</command> command to select
the <literal>performance</literal> profile. Some distros provides the
<command>tuned-adm</command> command for managing the profiles instead of
<command>powerprofilesctl</command>, on these distros issue the
<command>tuned-adm profile throughput-performance</command> command to
select the <literal>throughput-performance</literal> profile.</para>
<note>
<para>When multiple processors are used in this way, the SBU units in the
book will vary even more than they normally would. In some cases, the make
@ -44,10 +74,11 @@
interleaved. If you run into a problem with a build step, revert to a
single processor build to properly analyze the error messages.</para>
<para>The times presented here are based upon using four cores (-j4). The
<para>The times presented here for all packages
(except <xref linkend='ch-tools-binutils-pass1'/> which is based on one core)
are based upon using four cores (-j4). The
times in Chapter 8 also include the time to run the regression tests for
the package unless specified otherwise.</para>
</note>
</sect1>

View File

@ -5,7 +5,7 @@
%general-entities;
]>
<sect1 id="ch-tools-binutils-pass1" role="wrap">
<sect1 id="ch-tools-binutils-pass1" role="wrap" xreflabel="binutils-pass1">
<?dbhtml filename="binutils-pass1.html"?>
<sect1info condition="script">

View File

@ -135,10 +135,16 @@ cd build</userinput></screen>
command below, where x is the number of CPU cores on your system.</para>
</important>
<para>One set of tests in the GCC test suite is known to exhaust the default
stack, so increase the stack size prior to running the tests:</para>
<para>GCC may need more stack space compiling some extremely complex
code patterns. As a precaution for the host distros with a tight stack
limit, explicitly set the stack size hard limit to infinite.
On most host distros (and the final LFS system) the hard limit is
infinite by default, but there's no harm to set it explicitly anyway.
It's not needed to change the stack size soft limit because GCC will
automatically set it to an appropriate value, as long as the value does
not exceed the hard limit:</para>
<screen><userinput remap="test">ulimit -s 32768</userinput></screen>
<screen><userinput remap="test">ulimit -s -H unlimited</userinput></screen>
<para>Now remove/fix several known test failures:</para>

View File

@ -86,6 +86,9 @@ mail.* -/var/log/mail.log
user.* -/var/log/user.log
*.emerg *
# Do not open any internet ports.
secure_mode 2
# End /etc/syslog.conf</literal>
EOF</userinput></screen>

View File

@ -19,7 +19,7 @@ if [ -e LFS-RELEASE ]; then
fi
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 unavailable.
# Just workaround.
echo "<![ %sysv; [" > version.ent
echo "<!ENTITY version \"unknown\">" >> version.ent

View File

@ -322,7 +322,7 @@ function get_current()
$file = basename( $line ) . "\n";
if ( preg_match( "/patch$/", $file ) ) { continue; } // Skip patches
$file = preg_replace( "/bz2/", '', $file ); // The 2 confusses the regex
$file = preg_replace( "/bz2/", '', $file ); // The 2 confuses the regex
$file = rtrim( $file );
$pkg_pattern = "/(\D*).*/";

View File

@ -2,7 +2,7 @@
<!-- Notes:
For empty *-home entities use " " not ""
Packages sizes allways in KB
Packages sizes always in KB
Allowed deviation in SBUs : 10%
Allowed deviation in disk usage : 2%
@ -381,7 +381,7 @@
<!ENTITY less-fin-du "14 MB">
<!ENTITY less-fin-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20240823"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-version "20240825"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">

View File

@ -8,7 +8,7 @@
exclude-result-prefixes="cf exsl">
<!-- Top-level chunked code for fast processing.
Import standart customized chunk code.
Import standard customized chunk code.
Replaces {docbook-xsl}/xhtml/chunkfast.xsl
Note: Using this file as the top-level for chunked output implies that

View File

@ -36,7 +36,7 @@
</xsl:template>
<!-- indexterm:
Dropping unneeded anchors and fo:wraper elemments. -->
Dropping unneeded anchors and fo:wrapper elemments. -->
<!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
<xsl:template match="indexterm"/>
@ -111,7 +111,7 @@
</xsl:when>
<xsl:when test="$section.autolabel != 0">
<xsl:choose>
<!-- If the first sect2 isn't numbered, renumber the remainig sections -->
<!-- If the first sect2 isn't numbered, renumber the remaining sections -->
<xsl:when test="string-length(../sect2[1]/title) = 0">
<xsl:variable name="totalsect2">
<xsl:number count="sect2"/>

View File

@ -27,7 +27,7 @@
<xsl:include href="pdf/lfs-pagesetup.xsl"/>
<xsl:include href="pdf/lfs-xref.xsl"/>
<!-- Activate FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
<!-- Activate FOP-1 extensions. We use FOP-0.93 as the FO processor. -->
<xsl:param name="fop1.extensions" select="1"/>
<!-- Deactivate draft mode. -->
@ -93,7 +93,7 @@
<!-- Processing instruction for hard page breaks.
FOP-0.93 supports @keep-*.*, @orphans, and @widows attributes,
that solves several page break issues.
It also supports the soft page break procesing instruction included
It also supports the soft page break processing instruction included
in the DocBook stylesheets.
But sometimes we may need hard page breaks for final book versions.
To understand all of the page break features, see

View File

@ -39,8 +39,8 @@
<xsl:param name="variablelist.max.termlength">35</xsl:param>
<!-- varlistentry mode block:
Addibg a bullet, left alignament, and @kepp-*.* attributes
for packages and paches list. -->
Addibg a bullet, left alignment, and @kepp-*.* attributes
for packages and patches list. -->
<!-- The original template is in {docbook-xsl}/fo/list.xsl -->
<xsl:template match="varlistentry" mode="vl.as.blocks">
<xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
@ -135,7 +135,7 @@
</xsl:template>
<!-- simplelist:
Self-made template. Wrap it into a fo:block and process member childs.
Self-made template. Wrap it into a fo:block and process member child.
If @type is specified, the original templates will be used.
NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints
about not supported table-layout="auto" -->

View File

@ -5,7 +5,7 @@
version="1.0">
<!-- This stylesheet contains misc params, attribute sets and templates
for output formating.
for output formatting.
This file is for that templates that don't fit in other files. -->
<!-- What space do you want between normal paragraphs. -->
@ -128,7 +128,7 @@
</xsl:template>
<!-- literal:
Be sure that literal will use allways normal font weight. -->
Be sure that literal will use always normal font weight. -->
<!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
<xsl:template match="literal">
<fo:inline font-weight="normal">
@ -139,7 +139,7 @@
<!-- inline.monoseq:
Added hyphenate-url support to classname, exceptionname, interfacename,
methodname, computeroutput, constant, envar, filename, function, code,
literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
literal, option, prompt, systemitem, varname, sgmltag, tag, and uri -->
<!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
<xsl:template name="inline.monoseq">
<xsl:param name="content">

View File

@ -176,7 +176,7 @@
</xsl:template>
<!-- chapter title:
Small font size and left alignament. -->
Small font size and left alignment. -->
<!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"

View File

@ -4,9 +4,9 @@
xmlns="http://www.w3.org/1999/xhtml"
version="1.0">
<!-- This stylesheet contains misc templates for output formating.
<!-- This stylesheet contains misc templates for output formatting.
This file is for that templates that don't fit in other files
and that not afect the chunk algorithm. -->
and that do not affect the chunk algorithm. -->
<!-- Individual elements templates -->
@ -187,7 +187,7 @@
</xsl:template>
<!-- para/simplelist:
Self-made template. Add a line break and process the childs.
Self-made template. Add a line break and process the child.
If @type is specified, the original templates should be used,
but not tested. -->
<xsl:template match="para/simplelist">
@ -208,7 +208,7 @@
</xsl:template>
<!-- Named formating templates -->
<!-- Named formatting templates -->
<!-- Body attributes:
Add to the body XHTML output tag a class attribute with the book type

View File

@ -145,7 +145,7 @@
</xsl:template>
<!-- sect1:
When there is a role attibute, use it as the class value.
When there is a role attribute, use it as the class value.
Process the SVN keywords found in sect1info as a footnote.
Output title before the containing <div> so that the title
can be at a fixed position.
@ -171,7 +171,7 @@
</xsl:template>
<!-- sect2:
When there is a role attibute, use it as the class value.
When there is a role attribute, use it as the class value.
Removed unused code. -->
<!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
<xsl:template match="sect2">

View File

@ -65,7 +65,7 @@
</xsl:template>
<!-- toc.line:
Adding the h* tags and dropping unneded links.
Adding the h* tags and dropping unneeded links.
This template is a full re-made version of the original one. -->
<!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
<xsl:template name="toc.line">

View File

@ -51,7 +51,7 @@ exit
<xsl:template match="//text()"/>
<xsl:template match="//ulink">
<!-- Match only local patches links and skip duplicated URLs splitted for PDF output-->
<!-- Match only local patch links and skip duplicated URLs split for PDF output-->
<xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
and not(ancestor-or-self::*/@condition = 'pdf')">
<xsl:variable name="patch.name" select="substring-after(@url, '&patches-root;')"/>

View File

@ -15,7 +15,7 @@
<xsl:template match="ulink">
<!-- If some package don't have the predefined strings in their
name, the next test must be fixed to match it also. Skip possible
duplicated URLs due that may be splitted for PDF output -->
duplicated URLs due that may be split for PDF output -->
<xsl:if test="(contains(@url, '.tar.') or
contains(@url, '.tgz') or
contains(@url, '.patch')) and

View File

@ -1,6 +1,6 @@
The udev-lfs set of files is a customization of systemd.
In 2012, udev was merged with systemd and a build methodology
incompatible with LFS. These files add cusom udev rules
incompatible with LFS. These files add custom udev rules
for LFS.
These files are distributed in the form of a tar file available

View File

@ -2,7 +2,7 @@
# This script generates rules for persistent network device naming
# Data from udev-182 75-persistent-net-generator.rules
# Updated fof udev-197 (DEVICES=en*)
# Updated for udev-197 (DEVICES=en*)
RULES=/etc/udev/rules.d/70-persistent-net.rules
DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*})