Changeset 370b16d


Ignore:
Timestamp:
Jun 18, 2006, 5:08:47 PM (18 years ago)
Author:
Jim Gifford <clfs@…>
Children:
2322c31
Parents:
996dcd2
Message:

r3961@server (orig r1782): ken | 2006-06-18 17:05:16 -0700
Trying to fix the ppc64 boot chapter, with a minor fix to boot/ppc/yaboot, and tidying up the 'Important' messages in ppc64 yaboot.

Files:
6 added
10 edited

Legend:

Unmodified
Added
Removed
  • boot/ppc/yaboot-build.xml

    r996dcd2 r370b16d  
    3939    xpointer="xpointer(//*[@os='d'])"/>
    4040
     41    <para os="p1">The following patch allows <command>ofpath</command> to use
     42    <literal>PATH_PREFIX</literal> like the other
     43    <filename class="directory">ybin</filename> scripts:</para>
     44
     45<screen os="p2"><userinput>patch -Np1 -i ../&yaboot-ofpath_path-patch;</userinput></screen>
     46
    4147    <para>The Makefile is already set to do kernel-style cross-compiling,
    4248    but it will try to use <command>strip</command> to strip the second-stage
  • boot/ppc/yaboot.xml

    r996dcd2 r370b16d  
    7070    xpointer="xpointer(//*[@os='r'])"/>
    7171
    72 <screen os="j" role="nodump"><userinput>ybin -v -C /tools/etc/yaboot.conf</userinput></screen>
     72<screen os="j" role="nodump"><userinput>PATH_PREFIX=/tools ybin -v -C /tools/etc/yaboot.conf</userinput></screen>
     73
     74    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     75    href="../../bootable/ppc/yaboot.xml"
     76    xpointer="xpointer(//*[@os='t'])"/>
     77
     78<screen os="u" role="nodump"><userinput>PATH_PREFIX=/tools mkofboot</userinput></screen>
    7379
    7480  </sect2>
  • boot/ppc64-chapter.xml

    r996dcd2 r370b16d  
    2323  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
    2424  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/kernel.xml"/>
     25  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/hfsutils.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/mktemp.xml"/>
     27  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/powerpc-utils.xml"/>
     28  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/yaboot-build.xml"/>
    2529  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
    2630  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
     
    2933  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
    3034  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
    31   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot.xml"/>
     35  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/yaboot.xml"/>
    3236  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
    3337
  • bootable/ppc64-chapter.xml

    r996dcd2 r370b16d  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/kernel.xml"/>
     16  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/kernel.xml"/>
    1717  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot.xml"/>
    1818
  • final-system/ppc64/yaboot.xml

    r996dcd2 r370b16d  
    7171    </variablelist>
    7272
    73     <important>
    74       <para>The above patches and seds are critical in ensuring a
    75       successful build. In particular, the package will appear to install
    76       correctly without the second sed, but will fail to load linux,
    77       requiring you to use OF or a rescue disk to boot.</para>
    78     </important>
    79 
    8073    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    8174    href="../ppc/yaboot.xml"
     
    9285<screen os="h"><userinput>CFLAGS="${BUILD32}" make PREFIX=/usr</userinput></screen>
    9386
    94     <important>
    95       <para>The CFLAGS on the above command are equally critical
    96       for a successful install.</para>
    97     </important>
    98 
    9987    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    10088    href="../ppc/yaboot.xml"
    10189    xpointer="xpointer(//*[@os='i'])"/>
    10290
    103 <screen><userinput>make PREFIX=/usr install 2&gt;&amp;1 &gt;instlog</userinput></screen>
     91    <important os="j0">
     92      <para>The multilib install of yaboot can fail if you miss any of the
     93      patches or seds, or omit the CFLAGS variable. <command>ld</command> will
     94      issue warnings, but the install will appear to complete successfully.
     95      That would result in an unbootable system, so you need to log the output
     96      to check it.</para>
     97    </important>
     98
     99<screen><userinput>make PREFIX=/usr install 2&gt;&amp;1 | tee instlog</userinput></screen>
    104100
    105101    <para os='k'>To ensure that the install was successful, run the following
     
    109105
    110106    <para os='m'>If the command gave you <emphasis>any</emphasis> output
    111     (... is incompatible with powerpc:common output) the build is broken and
    112     you will have to repeat it with <emphasis>all</emphasis> of the items
    113     marked as important.</para>
     107    (... is incompatible with powerpc:common output) the build of yaboot is
     108    broken and you will have to correct your error(s) and repeat it.</para>
    114109
    115110  </sect2>
  • introduction/ppc/changelog.xml

    r996dcd2 r370b16d  
    3333
    3434-->
     35
     36    <listitem>
     37      <para>June 18, 2006</para>
     38      <itemizedlist>
     39        <listitem>
     40          <para>[ken] - Added patch to let ofpath use PATH_PREFIX and add missing
     41          PATH_PREFIX to the ybin command for the 'from CD' variant in Making the
     42          Temporary System Bootable.</para>
     43        </listitem>
     44      </itemizedlist>
     45    </listitem>
    3546
    3647    <listitem>
  • introduction/ppc64/changelog.xml

    r996dcd2 r370b16d  
    4141          instead of updating config.{guess,sub} from installed versions.</para>
    4242        </listitem>
     43        <listitem>
     44          <para>[ken] - Fix up the bootable chapter for hfsutils, mktemp,
     45          powerpc-utils, and yaboot. This should now work.</para>
     46        </listitem>
    4347      </itemizedlist>
    4448    </listitem>
  • materials/ppc/patches.xml

    r996dcd2 r370b16d  
    3535    </varlistentry>
    3636
     37    <varlistentry os="yaboot-ofpath_path-patch">
     38      <term>Yaboot (&yaboot-version;) Ofpath_Path_Prefix Patch - <token>&yaboot-ofpath_path-patch-size;</token>:</term>
     39      <listitem>
     40        <para>Download: <ulink
     41        url="&patches-root;yaboot/&yaboot-ofpath_path-patch;"/></para>
     42        <para>MD5 sum: <literal>&yaboot-ofpath_path-patch-md5;</literal></para>
     43      </listitem>
     44    </varlistentry>
     45
    3746    <varlistentry os="yaboot-sata-patch">
    3847      <term>Yaboot (&yaboot-version;) SATA Patch - <token>&yaboot-sata-patch-size;</token>:</term>
  • materials/ppc64/patches.xml

    r996dcd2 r370b16d  
    5454    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5555    href="../ppc/patches.xml"
     56    xpointer="xpointer(//*[@os='yaboot-ofpath_path-patch'])"/>
     57
     58    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     59    href="../ppc/patches.xml"
    5660    xpointer="xpointer(//*[@os='yaboot-sata-patch'])"/>
    5761
  • patches.ent

    r996dcd2 r370b16d  
    224224<!ENTITY yaboot-sata-patch-size "1 KB">
    225225
     226<!ENTITY yaboot-ofpath_path-patch "yaboot-&yaboot-version;-ofpath_path_prefix-1.patch">
     227<!ENTITY yaboot-ofpath_path-patch-md5 "3faf70e0cb4e4f62a1e8815c3452ab38">
     228<!ENTITY yaboot-ofpath_path-patch-size "1 KB">
     229
    226230<!-- Start of sparc/sparc64 patches -->
    227231
Note: See TracChangeset for help on using the changeset viewer.