Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/chroot/64/createfiles.xml

    r88ef769 r03e6a40  
    2020ln -sv /tools/bin/file /usr/bin
    2121ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    22 ln -sv /tools/lib/libstd* /usr/lib
     22ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
     23sed -e 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
    2324ln -sv bash /bin/sh
    2425ln -sv /run /var/run</userinput></screen>
    … …  
    2627  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2728  href="../../boot/64/createfiles.xml"
    28   xpointer="xpointer(//*[@os='b'])"/>
     29  xpointer="xpointer(//*[@os='e'])"/>
    2930
    3031<screen><userinput>mkdir -pv /usr/lib64
    31 ln -sv /tools/lib/libstd*so* /usr/lib64</userinput></screen>
     32ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib64</userinput></screen>
     33
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../../boot/common/createfiles.xml"
     36    xpointer="xpointer(//*[@os='c'])"/>
     37
     38    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     39    href="../common/createfiles.xml"
     40    xpointer="xpointer(//*[@os='d'])"/>
    3241
    3342</sect1>
Note: See TracChangeset for help on using the changeset viewer.