Changeset 229ed25 for BOOK/boot/ppc64


Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 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
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/boot/ppc64/e2fsprogs.xml

    rec008670 r229ed25  
    6868    xpointer="xpointer(//*[@os='f'])"/>
    6969
    70     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    71     href="../64/e2fsprogs.xml"
    72     xpointer="xpointer(//*[@os='g'])"/>
     70<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
     71    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
     72make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
     73    STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
    7374
    74     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    75     href="../common/e2fsprogs.xml"
    76     xpointer="xpointer(//*[@os='i'])"/>
     75    <para os="i">Install the e2fsck binary:</para>
    7776
    78     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    79     href="../common/e2fsprogs.xml"
    80     xpointer="xpointer(//*[@os='j'])"/>
     77<screen os="j"><userinput>make install -C e2fsck</userinput></screen>
    8178
    8279    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc64/kernel.xml

    rec008670 r229ed25  
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     81    href="../../bootable/x86/kernel.xml"
     82    xpointer="xpointer(//*[@os='s2'])"/>
     83
     84<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
     85   INSTALL_FW_PATH=${CLFS}/lib/firmware firmware_install</userinput></screen>
     86
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8188    href="../x86/kernel.xml"
    8289    xpointer="xpointer(//*[@os='u'])"/>

  • BOOK/boot/ppc64/util-linux-32.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-udev-n32" role="wrap">
    9   <?dbhtml filename="udev-n32.html"?>
     8<sect1 id="ch-boot-util-linux-32" role="wrap">
     9  <?dbhtml filename="util-linux-32.html"?>
    1010
    11   <title>Udev-&udev-version; N32 Libraries</title>
     11  <title>Util-linux-&util-linux-version; 32bit</title>
    1212
    13   <indexterm zone="ch-system-udev-n32">
    14     <primary sortas="a-Udev">Udev</primary>
    15     <secondary>N32</secondary>
     13  <indexterm zone="ch-boot-util-linux-32">
     14    <primary sortas="a-Util-linux">Util-linux 32bit</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/common/util-linux.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Udev</title>
    24 
     23    <title>Installation of Util-linux 32 bit</title>
     24   
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/udev.xml"
     26    href="../common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    … …  
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/udev.xml"
    37     xpointer="xpointer(//*[@os='c'])"/>
    38 
    39     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/udev.xml"
     36    href="../common/util-linux.xml"
    4137    xpointer="xpointer(//*[@os='d'])"/>
    4238
    4339    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/udev.xml"
     40    href="../common/util-linux.xml"
     41    xpointer="xpointer(//*[@os='e'])"/>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/util-linux.xml"
    4545    xpointer="xpointer(//*[@os='g'])"/>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/udev.xml"
     48    href="../common/util-linux.xml"
    4949    xpointer="xpointer(//*[@os='h'])"/>
    5050
    … …  
    5555
    5656    <para>Details on this package are located in <xref
    57     linkend="contents-udev" role="."/></para>
     57    linkend="contents-util-linux" role="."/></para>
    5858
    5959  </sect2>
     60
    6061</sect1>
    61 
    62 
    63 

  • BOOK/boot/ppc64/yaboot-build.xml

    rec008670 r229ed25  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../final-system/ppc/yaboot.xml"
     27    xpointer="xpointer(//*[@os='p3'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/ppc/yaboot.xml"
     31    xpointer="xpointer(//*[@os='p4'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/ppc/yaboot.xml"
     35    xpointer="xpointer(//*[@os='p5'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/ppc/yaboot.xml"
     39    xpointer="xpointer(//*[@os='p6'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2642    href="../ppc/yaboot-build.xml"
    2743    xpointer="xpointer(//*[@os='p1'])"/>
    … …  
    4359            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4460            -e 's/-o root -g root//' \
     61            -e 's/-Werror//' \
    4562    Makefile.orig &gt; Makefile</userinput></screen>
    4663
Note: See TracChangeset for help on using the changeset viewer.