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

MultiLib: Merge changes up to 11872

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11879 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2020-05-30 21:12:12 +00:00 committed by Xℹ Ruoyao
parent 8d4f212fe3
commit 6451cd1e10
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
9 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appendices/dependencies.xml
View File

@ -780,7 +780,7 @@
<segtitle>&before;</segtitle>
<seglistitem>
<seg>None</seg>
<seg>Binutils, IProute2, Kbd, Kmod, and Man-DB</seg>
</seglistitem>
</segmentedlist>
@ -837,7 +837,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar,
and Texinfo</seg>
Texinfo, and Zstd</seg>
</seglistitem>
</segmentedlist>
@ -2786,7 +2786,7 @@
<segtitle>&before;</segtitle>
<seglistitem>
<seg>None</seg>
<seg>GCC</seg>
</seglistitem>
</segmentedlist>

2
chapter05/chapter05.xml
View File

@ -29,8 +29,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>

4
chapter06/chapter06.xml
View File

@ -28,10 +28,12 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
@ -49,7 +51,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
@ -78,7 +79,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>

4
chapter06/coreutils.xml
View File

@ -116,7 +116,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
these tests are not skipped we'll add a temporary group and make the
user <systemitem class="username">tester</systemitem> a part of it:</para>
<screen><userinput remap="test">echo "tester:x:1000:nogroup" &gt;&gt; /etc/group</userinput></screen>
<screen><userinput remap="test">echo "dummy:x:1000:tester" &gt;&gt; /etc/group</userinput></screen>
<para>Fix some of the permissions so that the non-root user can compile and
run the tests:</para>
@ -132,11 +132,11 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
partially built system environment like the chroot environment here, but
passes if run at the end of this chapter. The test program tty.sh is
also known to fail.</para>
-->
<para>Remove the temporary group:</para>
<screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
-->
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>

2
chapter06/createfiles.xml
View File

@ -368,7 +368,7 @@ EOF</userinput></screen>
user here and delete this account at the end of the chapter.</para>
<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
echo "tester:x:101:dummy" &gt;&gt; /etc/group
echo "tester:x:101:" &gt;&gt; /etc/group
install -o tester -d /home/tester</userinput></screen>
<para>To remove the <quote>I have no name!</quote> prompt, start a new

2
chapter06/kbd.xml
View File

@ -60,7 +60,7 @@ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput></screen>
<para>Prepare Kbd for compilation:</para>
<screen><userinput remap="configure">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr --disable-vlock</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr --disable-vlock</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

2
chapter06/make.xml
View File

@ -56,7 +56,7 @@
We use an environment variable to accomplish this. To test the
results, issue:</para>
<screen><userinput remap="test">make PERL5LIB=$PWD/tests/ check</userinput></screen>
<screen><userinput remap="test">make check</userinput></screen>
<para>Install the package:</para>

1
chapter06/revisedchroot.xml
View File

@ -51,6 +51,7 @@ chroot "$LFS" /usr/bin/env -i \
remove them now:</para>
<screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
rm -f /usr/lib/libctf{,-nobfd}.a
rm -f /usr/lib/libbz2.a
rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
rm -f /usr/lib/libltdl.a

2
chapter06/sed.xml
View File

@ -56,7 +56,7 @@ make html</userinput></screen>
<para>To test the results, issue:</para>
<screen><userinput remap="test">chown -Rv tester .
su -c "PATH=$PATH make check"</userinput></screen>
su tester -c "PATH=$PATH make check"</userinput></screen>
<para>Install the package and its documentation:</para>