Changeset 3ae6751


Ignore:
Timestamp:
Feb 21, 2006, 1:10:45 AM (17 years ago)
Author:
Jim Gifford <clfs@…>
Children:
20c8692
Parents:
930f404
Message:

r725@server (orig r723): manuel | 2005-11-19 10:00:15 -0800
Unifiying linux and linux-libc-headers package version entities. Boot chapter.

Location:
boot
Files:
4 deleted
17 edited

Legend:

Unmodified
Added
Removed
  • boot/alpha/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-alpha-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    106106    xpointer="xpointer(//*[@os='v'])"/>
    107107
    108 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-alpha-version;</userinput></screen>
     108<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    112112    xpointer="xpointer(//*[@os='x'])"/>
    113113
    114 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-alpha-version;</userinput></screen>
     114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     115    href="../x86/kernel.xml"
     116    xpointer="xpointer(//*[@os='x1'])"/>
    115117
    116118  </sect2>
  • boot/mips/colo.xml

    r930f404 r3ae6751  
    3333# load linux
    3434#
    35 lcd 'Booting &linux-mips-version;...'
    36 load vmlinux-&linux-mips-version;.gz
     35lcd 'Booting &linux-version;...'
     36load vmlinux-&linux-version;.gz
    3737execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
    3838EOF</userinput></screen>
  • boot/mips/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-mips-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    122122    xpointer="xpointer(//*[@os='v'])"/>
    123123
    124 <screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-mips-version;
    125 gzip -9 ${LFS}/boot/vmlinux-&linux-mips-version;</userinput></screen>
     124<screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-version;
     125gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
    126126
    127127    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    129129    xpointer="xpointer(//*[@os='x'])"/>
    130130
    131 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-mips-version;</userinput></screen>
     131    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     132    href="../x86/kernel.xml"
     133    xpointer="xpointer(//*[@os='x1'])"/>
    132134
    133135  </sect2>
  • boot/mips64-64-chapter.xml

    r930f404 r3ae6751  
    2424  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/colo-build.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
  • boot/mips64-chapter.xml

    r930f404 r3ae6751  
    2424  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo-build.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
  • boot/mips64/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-mips64-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../../bootable/mips64/kernel.xml"
     30    href="../../bootable/mips/kernel.xml"
    3131    xpointer="xpointer(//*[@os='ba'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    34     href="../../bootable/mips64/kernel.xml"
     34    href="../../bootable/mips/kernel.xml"
    3535    xpointer="xpointer(//*[@os='bb'])"/>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    38     href="../../bootable/mips64/kernel.xml"
     38    href="../../bootable/mips/kernel.xml"
    3939    xpointer="xpointer(//*[@os='bc'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    42     href="../../bootable/mips64/kernel.xml"
     42    href="../../bootable/mips/kernel.xml"
    4343    xpointer="xpointer(//*[@os='bd'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    46     href="../../bootable/mips64/kernel.xml"
     46    href="../../bootable/mips/kernel.xml"
    4747    xpointer="xpointer(//*[@os='a'])"/>
    4848
     
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    54     href="../../bootable/mips64/kernel.xml"
     54    href="../../bootable/mips/kernel.xml"
    5555    xpointer="xpointer(//*[@os='b'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    58     href="../../bootable/mips64/kernel.xml"
     58    href="../../bootable/mips/kernel.xml"
    5959    xpointer="xpointer(//*[@os='c'])"/>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    62     href="../../bootable/mips64/kernel.xml"
     62    href="../../bootable/mips/kernel.xml"
    6363    xpointer="xpointer(//*[@os='d'])"/>
    6464
     
    6868
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    70     href="../../bootable/mips64/kernel.xml"
     70    href="../../bootable/mips/kernel.xml"
    7171    xpointer="xpointer(//*[@os='f'])"/>
    7272
    7373    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../../bootable/mips64/kernel.xml"
     74    href="../../bootable/mips/kernel.xml"
    7575    xpointer="xpointer(//*[@os='g'])"/>
    7676
     
    9090
    9191    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    92     href="../../bootable/mips64/kernel.xml"
     92    href="../../bootable/mips/kernel.xml"
    9393    xpointer="xpointer(//*[@os='l'])"/>
    9494
    9595    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    96     href="../../bootable/mips64/kernel.xml"
     96    href="../../bootable/mips/kernel.xml"
    9797    xpointer="xpointer(//*[@os='m'])"/>
    9898
     
    104104
    105105    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    106     href="../../bootable/mips64/kernel.xml"
     106    href="../../bootable/mips/kernel.xml"
    107107    xpointer="xpointer(//*[@os='p'])"/>
    108108
    109109    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    110     href="../../bootable/mips64/kernel.xml"
     110    href="../../bootable/mips/kernel.xml"
    111111    xpointer="xpointer(//*[@os='q'])"/>
    112112
    113113    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    114     href="../../bootable/mips64/kernel.xml"
     114    href="../../bootable/mips/kernel.xml"
    115115    xpointer="xpointer(//*[@os='s'])"/>
    116116
     
    119119
    120120    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    121     href="../../bootable/mips64/kernel.xml"
     121    href="../../bootable/mips/kernel.xml"
    122122    xpointer="xpointer(//*[@os='u'])"/>
    123123
    124124    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    125     href="../../bootable/mips64/kernel.xml"
     125    href="../../bootable/mips/kernel.xml"
    126126    xpointer="xpointer(//*[@os='v'])"/>
    127127
    128 <screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-mips64-version;
    129 gzip -9 ${LFS}/boot/vmlinux-&linux-mips64-version;</userinput></screen>
     128<screen><userinput>cp vmlinux ${LFS}/boot/vmlinux-&linux-version;
     129gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
    130130
    131131    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    132     href="../../bootable/mips64/kernel.xml"
     132    href="../../bootable/mips/kernel.xml"
    133133    xpointer="xpointer(//*[@os='x'])"/>
    134134
    135 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-mips64-version;</userinput></screen>
     135    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     136    href="../x86/kernel.xml"
     137    xpointer="xpointer(//*[@os='x1'])"/>
    136138
    137139  </sect2>
  • boot/ppc/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-ppc-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    106106    xpointer="xpointer(//*[@os='v'])"/>
    107107
    108 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-ppc-version;</userinput></screen>
     108<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    112112    xpointer="xpointer(//*[@os='x'])"/>
    113113
    114 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-ppc-version;</userinput></screen>
     114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     115    href="../x86/kernel.xml"
     116    xpointer="xpointer(//*[@os='x1'])"/>
    115117
    116118  </sect2>
  • boot/sparc/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-sparc-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    106106    xpointer="xpointer(//*[@os='v'])"/>
    107107
    108 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-sparc-version;</userinput></screen>
     108<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    112112    xpointer="xpointer(//*[@os='x'])"/>
    113113
    114 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-sparc-version;</userinput></screen>
     114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     115    href="../x86/kernel.xml"
     116    xpointer="xpointer(//*[@os='x1'])"/>
    115117
    116118  </sect2>
  • boot/sparc/silo.xml

    r930f404 r3ae6751  
    2525timeout = 150         # Wait 15 seconds before booting the default section
    2626
    27 image = /boot/lfskernel-&linux-sparc-version;
     27image = /boot/lfskernel-&linux-version;
    2828  label = linux
    2929# End /etc/silo.conf</literal>
  • boot/sparc64-64-chapter.xml

    r930f404 r3ae6751  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
    32   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/silo.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
    3333  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
    3434
  • boot/sparc64-chapter.xml

    r930f404 r3ae6751  
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
    3232  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
    33   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
     33  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
    3434  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
    3535
  • boot/sparc64/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-sparc64-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../../bootable/sparc64/kernel.xml"
     30    href="../../bootable/sparc/kernel.xml"
    3131    xpointer="xpointer(//*[@os='a'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    34     href="../../bootable/sparc64/kernel.xml"
     34    href="../../bootable/sparc/kernel.xml"
    3535    xpointer="xpointer(//*[@os='b'])"/>
    3636
     
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    44     href="../../bootable/sparc64/kernel.xml"
     44    href="../../bootable/sparc/kernel.xml"
    4545    xpointer="xpointer(//*[@os='d'])"/>
    4646
     
    5050
    5151    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    52     href="../../bootable/sparc64/kernel.xml"
     52    href="../../bootable/sparc/kernel.xml"
    5353    xpointer="xpointer(//*[@os='f'])"/>
    5454
    5555    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    56     href="../../bootable/sparc64/kernel.xml"
     56    href="../../bootable/sparc/kernel.xml"
    5757    xpointer="xpointer(//*[@os='g'])"/>
    5858
     
    7272
    7373    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../../bootable/sparc64/kernel.xml"
     74    href="../../bootable/sparc/kernel.xml"
    7575    xpointer="xpointer(//*[@os='l'])"/>
    7676
    7777    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../../bootable/sparc64/kernel.xml"
     78    href="../../bootable/sparc/kernel.xml"
    7979    xpointer="xpointer(//*[@os='m'])"/>
    8080
     
    8686
    8787    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    88     href="../../bootable/sparc64/kernel.xml"
     88    href="../../bootable/sparc/kernel.xml"
    8989    xpointer="xpointer(//*[@os='p'])"/>
    9090
    9191    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    92     href="../../bootable/sparc64/kernel.xml"
     92    href="../../bootable/sparc/kernel.xml"
    9393    xpointer="xpointer(//*[@os='q'])"/>
    9494
    9595    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    96     href="../../bootable/sparc64/kernel.xml"
     96    href="../../bootable/sparc/kernel.xml"
    9797    xpointer="xpointer(//*[@os='s'])"/>
    9898
     
    101101
    102102    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    103     href="../../bootable/sparc64/kernel.xml"
     103    href="../../bootable/sparc/kernel.xml"
    104104    xpointer="xpointer(//*[@os='u'])"/>
    105105
    106106    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    107     href="../../bootable/sparc64/kernel.xml"
     107    href="../../bootable/sparc/kernel.xml"
    108108    xpointer="xpointer(//*[@os='v'])"/>
    109109
    110 <screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-sparc64-version;</userinput></screen>
     110<screen><userinput>cp vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
    111111
    112112    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    113     href="../../bootable/sparc64/kernel.xml"
     113    href="../../bootable/sparc/kernel.xml"
    114114    xpointer="xpointer(//*[@os='x'])"/>
    115115
    116 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-sparc64-version;</userinput></screen>
     116    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     117    href="../x86/kernel.xml"
     118    xpointer="xpointer(//*[@os='x1'])"/>
    117119
    118120  </sect2>
  • boot/x86/grub.xml

    r930f404 r3ae6751  
    9090title LFS &version;
    9191root (hd0,3)
    92 kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
     92kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
    9393EOF</userinput></screen>
    9494
  • boot/x86/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-x86-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    113113    xpointer="xpointer(//*[@os='v'])"/>
    114114
    115 <screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86-version;</userinput></screen>
     115<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
    116116
    117117    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    119119    xpointer="xpointer(//*[@os='x'])"/>
    120120
    121 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-x86-version;</userinput></screen>
     121<screen os="x1"><userinput>cp System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
    122122
    123123  </sect2>
  • boot/x86_64-64-chapter.xml

    r930f404 r3ae6751  
    2424  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/grub-build.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
  • boot/x86_64-chapter.xml

    r930f404 r3ae6751  
    2424  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub-build.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
  • boot/x86_64/kernel.xml

    r930f404 r3ae6751  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-x86-version;</title>
     11  <title>Linux-&linux-version;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
     
    110110    xpointer="xpointer(//*[@os='v'])"/>
    111111
    112 <screen><userinput>cp arch/x86_64/boot/bzImage ${LFS}/boot/lfskernel-&linux-x86_64-version;</userinput></screen>
     112<screen><userinput>cp arch/x86_64/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
    113113
    114114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    116116    xpointer="xpointer(//*[@os='x'])"/>
    117117
    118 <screen><userinput>cp System.map ${LFS}/boot/System.map-&linux-x86_64-version;</userinput></screen>
     118    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     119    href="../x86/kernel.xml"
     120    xpointer="xpointer(//*[@os='x1'])"/>
    119121
    120122  </sect2>
Note: See TracChangeset for help on using the changeset viewer.