Changeset 4a74a6f


Ignore:
Timestamp:
11/03/2021 04:45:09 AM (9 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
f08c6def
Parents:
00696e1d (diff), 3328dfd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • chapter06/gawk.xml

    r00696e1d r4a74a6f  
    5252<screen><userinput remap="configure">./configure --prefix=/usr   \
    5353            --host=$LFS_TGT \
    54             --build=$(./config.guess)</userinput></screen>
     54            --build=$(build-aux/config.guess)</userinput></screen>
    5555
    5656    <para>Compile the package:</para>
  • chapter07/createfiles.xml

    r00696e1d r4a74a6f  
    6262
    6363<screen revision="sysv"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
    64 <literal>root:x:0:0:root:/root:/usr/bin/bash
     64<literal>root:x:0:0:root:/root:/bin/bash
    6565bin:x:1:1:bin:/dev/null:/usr/bin/false
    6666daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
     
    7171
    7272<screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
    73 <literal>root:x:0:0:root:/root:/usr/bin/bash
     73<literal>root:x:0:0:root:/root:/bin/bash
    7474bin:x:1:1:bin:/dev/null:/usr/bin/false
    7575daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
     
    176176  chapter.</para>
    177177
    178 <screen><userinput>echo "tester:x:101:101::/home/tester:/usr/bin/bash" &gt;&gt; /etc/passwd
     178<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
    179179echo "tester:x:101:" &gt;&gt; /etc/group
    180180install -o tester -d /home/tester</userinput></screen>
  • chapter08/systemd.xml

    r00696e1d r4a74a6f  
    6060        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
    6161
    62     <para>Fix a mesaon problem:</para>
     62    <para>Fix a meson problem:</para>
    6363
    6464 <screen><userinput remap="pre">sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build</userinput></screen>
Note: See TracChangeset for help on using the changeset viewer.