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

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2022-02-05 05:45:10 +01:00
commit 3e09569e0d
7 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chapter05/binutils-pass1.xml
View File

@ -144,20 +144,7 @@ cd build</userinput></screen>
<para>Install the package:</para>
<screen><userinput remap="install">make install -j1</userinput></screen>
<variablelist>
<title>The meaning of the make parameter:</title>
<varlistentry>
<term><parameter>-j1</parameter></term>
<listitem>
<para>An issue in the building system may cause the installation
to fail with <option>-j N</option> in <envar>MAKEFLAGS</envar>.
Override it to workaround this issue.</para>
</listitem>
</varlistentry>
</variablelist>
<screen><userinput remap="install">make install</userinput></screen>
</sect2>

2
chapter06/binutils-pass2.xml
View File

@ -106,7 +106,7 @@ cd build</userinput></screen>
<filename class="libraryfile">libctf.so</filename>
to link against zlib from the host distribution:</para>
<screen><userinput remap="install">make DESTDIR=$LFS install -j1
<screen><userinput remap="install">make DESTDIR=$LFS install
install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
</sect2>

1
chapter07/createfiles.xml
View File

@ -74,7 +74,6 @@ EOF</userinput></screen>
bin:x:1:1:bin:/dev/null:/usr/bin/false
daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/usr/bin/false
systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/usr/bin/false
systemd-journal-remote:x:74:74:systemd Journal Remote:/:/usr/bin/false
systemd-journal-upload:x:75:75:systemd Journal Upload:/:/usr/bin/false

2
chapter08/binutils.xml
View File

@ -195,7 +195,7 @@ cd build</userinput></screen>
-->
<para>Install the package:</para>
<screen><userinput remap="install">make tooldir=/usr install -j1</userinput></screen>
<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
<para>Remove useless static libraries:</para>

3
chapter08/systemd.xml
View File

@ -131,7 +131,8 @@ meson --prefix=/usr \
services responsible for setting up the
<filename>/etc/group</filename> and
<filename>/etc/passwd</filename> files. Both files
were created earlier in this chapter.</para>
were created earlier in this chapter. This daemon is not useful
on an LFS system since user accounts are manually created.</para>
</listitem>
</varlistentry>

12
chapter09/networkd.xml
View File

@ -184,15 +184,21 @@ EOF</userinput></screen>
or any other software that generates an <filename>/etc/resolv.conf</filename>
(ex: a <command>resolvconf</command> program other than the one
provided by systemd), the <command>systemd-resolved</command> service
should not be used.</para></note>
should not be used.</para>
<para>To disable systemd-resolved, issue the following command:</para>
<screen role="nodump"><userinput>systemctl disable systemd-resolved</userinput></screen></note>
<para>When using <command>systemd-resolved</command> for DNS
configuration, it creates the file
<filename>/run/systemd/resolve/resolv.conf</filename>. Create a
<filename>/run/systemd/resolve/resolv.conf</filename>.</para>
<!--Create a
symlink in <filename>/etc</filename> to use the generated file:</para>
<screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
At least in systemd-250, this file gets created on first bootup.
-->
</sect3>
<sect3 id="resolv-conf-static">

5
lfs-latest-git.php
View File

@ -133,7 +133,8 @@ if ( $package == "shadow" ) $dirpath = "https://github.com/shadow-maint/shad
if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/";
if ( $package == "Jinja" ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
if ( $package == "systemd" ) $dirpath = "https://github.com/systemd/systemd/releases";
if ( $package == "tcl" ) $dirpath = "https://sourceforge.net/projects/tcl/files";
//if ( $package == "tcl" ) $dirpath = "https://sourceforge.net/projects/tcl/files";
if ( $package == "tcl" ) $dirpath = "https://www.tcl.tk/software/tcltk/download.html";
if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
if ( $package == "vim" ) $dirpath = "https://github.com/vim/vim/tags";
if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/releases";
@ -264,7 +265,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
}
if ( $package == "tcl" )
return find_max( $lines, "/tcl/", "/^.*tcl(\d[\d\.]*\d)-src.*$/" );
return find_max( $lines, "/tcl\d/", "/^.*tcl(\d\.[\d\.]*\d)-src.*$/" );
if ( $package == "ninja" )
return find_max( $lines, "/v\d/", "/^.*v(\d[\d\.]*\d).*$/" );