Changeset 229ed25 for BOOK/boot/ppc64-64


Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/boot/ppc64-64
Files:
1 added
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/boot/ppc64-64/powerpc-utils.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-udev-32" role="wrap">
    9   <?dbhtml filename="udev.html"?>
     8<sect1 id="ch-boot-powerpc-utils" role="wrap">
     9  <?dbhtml filename="powerpc-utils.html"?>
    1010
    11   <title>Udev-&udev-version; 32 Bit Libraries</title>
     11  <title>Powerpc-Utils_&powerpcutils-version;</title>
    1212
    13   <indexterm zone="ch-system-udev-32">
    14     <primary sortas="a-Udev">Udev 32 Bit Libraries</primary>
    15     <secondary>32 Bit</secondary>
     13  <indexterm zone="ch-boot-powerpc-utils">
     14    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
     15    <secondary>boot</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/udev.xml"
     19  href="../../final-system/ppc/powerpc-utils.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Udev</title>
     23    <title>Installation of Powerpc-Utils</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/udev.xml"
     26    href="../../final-system/ppc/powerpc-utils.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
     
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/udev.xml"
     36    href="../ppc/powerpc-utils.xml"
     37    xpointer="xpointer(//*[@os='a'])"/>
     38
     39<screen><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../ppc/powerpc-utils.xml"
    3743    xpointer="xpointer(//*[@os='c'])"/>
    3844
    3945    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/udev.xml"
     46    href="../ppc/powerpc-utils.xml"
    4147    xpointer="xpointer(//*[@os='d'])"/>
    42 
    43     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/udev.xml"
    45     xpointer="xpointer(//*[@os='g'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/udev.xml"
    49     xpointer="xpointer(//*[@os='h'])"/>
    5048
    5149  </sect2>
     
    5452    <title/>
    5553
    56     <para>Details on this package are located in <xref
    57     linkend="contents-udev" role="."/></para>
     54    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
    5855
    5956  </sect2>
     57
    6058</sect1>
    61 
Note: See TracChangeset for help on using the changeset viewer.