Changeset 0e9d60e


Ignore:
Timestamp:
05/30/2020 09:12:12 PM (3 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1, multilib-before-cross
Children:
d4fdde6
Parents:
777c890
Message:

MultiLib: Merge changes up to 11872

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11879 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    r777c890 r0e9d60e  
    781781
    782782        <seglistitem>
    783           <seg>None</seg>
     783          <seg>Binutils, IProute2, Kbd, Kmod, and Man-DB</seg>
    784784        </seglistitem>
    785785      </segmentedlist>
    … …  
    838838         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
    839839         Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar,
    840          and Texinfo</seg>
     840         Texinfo, and Zstd</seg>
    841841        </seglistitem>
    842842      </segmentedlist>
    … …  
    27872787
    27882788        <seglistitem>
    2789           <seg>None</seg>
     2789          <seg>GCC</seg>
    27902790        </seglistitem>
    27912791      </segmentedlist>

  • chapter05/chapter05.xml

    r777c890 r0e9d60e  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
    32   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
    33   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
    3432  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
    3533  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>

  • chapter06/chapter06.xml

    r777c890 r0e9d60e  
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
     31  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
    3132  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
    3435  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
     36  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
    3537  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
    3638  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
    … …  
    5052  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
    5153  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
    52   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
    5354  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
    5455  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
    … …  
    7980  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
    8081  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
    81   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
    8282  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
    8383  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>

  • chapter06/coreutils.xml

    r777c890 r0e9d60e  
    117117    user <systemitem class="username">tester</systemitem> a part of it:</para>
    118118
    119 <screen><userinput remap="test">echo "tester:x:1000:nogroup" &gt;&gt; /etc/group</userinput></screen>
     119<screen><userinput remap="test">echo "dummy:x:1000:tester" &gt;&gt; /etc/group</userinput></screen>
    120120
    121121    <para>Fix some of the permissions so that the non-root user can compile and
    … …  
    133133    passes if run at the end of this chapter.  The test program tty.sh is
    134134    also known to fail.</para>
     135-->
    135136
    136137    <para>Remove the temporary group:</para>
    137138
    138139<screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
    139 -->
    140140    <para>Install the package:</para>
    141141

  • chapter06/createfiles.xml

    r777c890 r0e9d60e  
    369369
    370370<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
    371 echo "tester:x:101:dummy" &gt;&gt; /etc/group
     371echo "tester:x:101:" &gt;&gt; /etc/group
    372372install -o tester -d /home/tester</userinput></screen>
    373373

  • chapter06/kbd.xml

    r777c890 r0e9d60e  
    6161    <para>Prepare Kbd for compilation:</para>
    6262
    63 <screen><userinput remap="configure">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr --disable-vlock</userinput></screen>
     63<screen><userinput remap="configure">./configure --prefix=/usr --disable-vlock</userinput></screen>
    6464
    6565    <variablelist>

  • chapter06/make.xml

    r777c890 r0e9d60e  
    5757    results, issue:</para>
    5858
    59 <screen><userinput remap="test">make PERL5LIB=$PWD/tests/ check</userinput></screen>
     59<screen><userinput remap="test">make check</userinput></screen>
    6060
    6161    <para>Install the package:</para>

  • chapter06/revisedchroot.xml

    r777c890 r0e9d60e  
    5252
    5353<screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
     54rm -f /usr/lib/libctf{,-nobfd}.a
    5455rm -f /usr/lib/libbz2.a
    5556rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a

  • chapter06/sed.xml

    r777c890 r0e9d60e  
    5757
    5858<screen><userinput remap="test">chown -Rv tester .
    59 su -c "PATH=$PATH make check"</userinput></screen>
     59su tester -c "PATH=$PATH make check"</userinput></screen>
    6060
    6161    <para>Install the package and its documentation:</para>
Note: See TracChangeset for help on using the changeset viewer.