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 moved

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/64/util-linux.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-chroot-util-linux" role="wrap">
     8<sect1 id="ch-temp-system-util-linux" role="wrap">
    99  <?dbhtml filename="util-linux.html"?>
    1010
    1111  <title>Util-linux-&util-linux-version;</title>
    1212
    13   <indexterm zone="ch-chroot-util-linux">
     13  <indexterm zone="ch-temp-system-util-linux">
    1414    <primary sortas="a-Util-linux">Util-linux</primary>
    15     <secondary>chroot</secondary>
     15    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    … …  
    2929<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
     31    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/util-linux.xml"
     35    xpointer="xpointer(//*[@os='c'])"/>
    3236
    3337    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.