Changeset 7f8996d


Ignore:
Timestamp:
Jul 2, 2014, 5:12:18 PM (10 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
684aab1
Parents:
c5afbba
Message:

Correction to previous commit, we want &linux-version2; entity where it is required. Do not use &linux-version; and &linux-version2; entities together. We just want Linux-3.14.10 where required, rather than LInux-3.14. And surely we do not want LInux-3.14-3.14.10.

Location:
BOOK
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/mips/colo.xml

    rc5afbba r7f8996d  
    3333# load linux
    3434#
    35 lcd 'Booting &linux-version;-&linux-version2;...'
    36 load vmlinux-&linux-version;-&linux-version2;.gz
     35lcd 'Booting &linux-version2;...'
     36load vmlinux-&linux-version2;.gz
    3737execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
    3838EOF</userinput></screen>

  • BOOK/boot/mips/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9090
    9191<screen><userinput>mkdir -pv /tools/boot
    92 cp -v vmlinux /tools/boot/vmlinux-&linux-version;-&linux-version2;
    93 gzip -9 /tools/boot/vmlinux-&linux-version;-&linux-version2;</userinput></screen>
     92cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
     93gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
    9494
    9595    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/mips64/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9494
    9595<screen><userinput>mkdir -pv /tools/boot
    96 cp -v vmlinux /tools/boot/vmlinux-&linux-version;-&linux-version2;
    97 gzip -9 /tools/boot/vmlinux-&linux-version;-&linux-version2;</userinput></screen>
     96cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
     97gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
    9898
    9999    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9595
    9696<screen><userinput>mkdir -pv /tools/boot
    97 cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
     97cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
    9898
    9999    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc64/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9494
    9595<screen><userinput>mkdir -pv /tools/boot
    96 cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
     96cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
    9797
    9898    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/sparc/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9090
    9191<screen><userinput>mkdir -pv /tools/boot
    92 cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
     92cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/sparc/silo.xml

    rc5afbba r7f8996d  
    2525timeout = 150         # Wait 15 seconds before booting the default section
    2626
    27 image = /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;
     27image = /tools/boot/vmlinuz-clfs-&linux-version2;
    2828  label = linux
    2929# End /etc/silo.conf</literal>

  • BOOK/boot/sparc64/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9292
    9393<screen><userinput>mkdir -pv /tools/boot
    94 cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
     94cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
    9595
    9696    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/x86/kernel.xml

    rc5afbba r7f8996d  
    109109
    110110<screen><userinput>mkdir -pv /tools/boot
    111 cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
     111cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
    112112
    113113    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    115115    xpointer="xpointer(//*[@os='w'])"/>
    116116
    117 <screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;-&linux-version2;</userinput></screen>
     117<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version2;</userinput></screen>
    118118
    119119    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    121121    xpointer="xpointer(//*[@os='x'])"/>
    122122
    123 <screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;-&linux-version2;</userinput></screen>
     123<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version2;</userinput></screen>
    124124
    125125  </sect2>

  • BOOK/boot/x86_64/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-boot-kernel">
    … …  
    9494
    9595<screen><userinput>mkdir -pv /tools/boot
    96 cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
     96cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
    9797
    9898    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/bootable/mips/arcload.xml

    rc5afbba r7f8996d  
    3131
    3232CLFS {
    33   &linux-version;-&linux-version2; {
    34     description  "&linux-version;-&linux-version2;";
    35     image system "/&linux-version;-&linux-version2;";
     33  &linux-version2; {
     34    description  "&linux-version2;";
     35    image system "/&linux-version2;";
    3636  }
    3737
    … …  
    4848<screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash sash
    4949dvhtool --unix-to-vh /boot/arc.cf arc.cf
    50 dvhtool --unix-to-vh /boot/&linux-version;-&linux-version2; &linux-version;-&linux-version2;</userinput></screen>
     50dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
    5151
    5252</sect1>

  • BOOK/bootable/mips/colo.xml

    rc5afbba r7f8996d  
    4141# load linux
    4242#
    43 lcd 'Booting &linux-version;-&linux-version2;...'
    44 load vmlinux-&linux-version;-&linux-version2;.gz
     43lcd 'Booting &linux-version2;...'
     44load vmlinux-&linux-version2;.gz
    4545execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
    4646EOF</userinput></screen>

  • BOOK/bootable/mips/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-bootable-kernel">
    … …  
    102102    xpointer="xpointer(//*[@os='v'])"/>
    103103
    104 <screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version;-&linux-version2;
    105 gzip -9 /boot/vmlinux-&linux-version;-&linux-version2;</userinput></screen>
     104<screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version2;
     105gzip -9 /boot/vmlinux-&linux-version2;</userinput></screen>
    106106
    107107    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/bootable/mips64/arcload.xml

    rc5afbba r7f8996d  
    3131
    3232CLFS {
    33   &linux-version;-&linux-version2; {
    34     description  "&linux-version;-&linux-version2;";
    35     image system "/&linux-version;-&linux-version2;";
     33  &linux-version2; {
     34    description  "&linux-version2;";
     35    image system "/&linux-version2;";
    3636  }
    3737
    … …  
    4848<screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash64 sash64
    4949dvhtool --unix-to-vh /boot/arc.cf arc.cf
    50 dvhtool --unix-to-vh /boot/&linux-version;-&linux-version2; &linux-version;-&linux-version2;</userinput></screen>
     50dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
    5151
    5252</sect1>

  • BOOK/bootable/ppc/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-bootable-kernel">
    … …  
    114114    xpointer="xpointer(//*[@os='v'])"/>
    115115
    116 <screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
     116<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
    117117
    118118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/bootable/ppc/yaboot.xml

    rc5afbba r7f8996d  
    6363  <parameter>device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:</parameter>
    6464  for the disk, and
    65   <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;-&linux-version2;</parameter>
     65  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version2;</parameter>
    6666  which definitely works.</para>
    6767
    … …  
    113113# on which they are situated and can include at most one
    114114# directory
    115 image=/boot/clfskernel-&linux-version;-&linux-version2;
     115image=/boot/clfskernel-&linux-version2;
    116116    label=&version;
    117117    read-only</literal>

  • BOOK/bootable/sparc/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-bootable-kernel">
    … …  
    106106    xpointer="xpointer(//*[@os='v'])"/>
    107107
    108 <screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
     108<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/bootable/sparc/silo.xml

    rc5afbba r7f8996d  
    2525timeout = 150         # Wait 15 seconds before booting the default section
    2626
    27 image = /boot/clfskernel-&linux-version;-&linux-version2;
     27image = /boot/clfskernel-&linux-version2;
    2828  label = linux
    2929# End /etc/silo.conf</literal>

  • BOOK/bootable/x86/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-bootable-kernel">
    … …  
    132132    <para os="v">Issue the following command to install the kernel:</para>
    133133
    134 <screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
     134<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
    135135
    136136    <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
    … …  
    139139    kernel. Issue the following command to install the map file:</para>
    140140
    141 <screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version;-&linux-version2;</userinput></screen>
     141<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version2;</userinput></screen>
    142142
    143143    <para os="x">The kernel configuration file <filename>.config</filename>
    … …  
    146146    It is a good idea to keep this file for future reference:</para>
    147147
    148 <screen os="x1"><userinput>cp -v .config /boot/config-&linux-version;-&linux-version2;</userinput></screen>
     148<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version2;</userinput></screen>
    149149
    150150    <para os="y">It is important to note that the files in the kernel source

  • BOOK/bootable/x86_64/kernel.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="kernel.html"?>
    1010
    11   <title>Linux-&linux-version;-&linux-version2;</title>
     11  <title>Linux-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-bootable-kernel">
    … …  
    106106    xpointer="xpointer(//*[@os='v'])"/>
    107107
    108 <screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
     108<screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/mips/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-cross-tools-linux-headers">

  • BOOK/cross-tools/ppc/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-cross-tools-linux-headers">

  • BOOK/cross-tools/sparc/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-cross-tools-linux-headers">

  • BOOK/cross-tools/sparc64/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-cross-tools-linux-headers">

  • BOOK/cross-tools/x86/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-cross-tools-linux-headers">

  • BOOK/cross-tools/x86_64/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-cross-tools-linux-headers">

  • BOOK/final-system/common/linux-headers.xml

    rc5afbba r7f8996d  
    99  <?dbhtml filename="linux-headers.html"?>
    1010
    11   <title>Linux-Headers-&linux-version;-&linux-version2;</title>
     11  <title>Linux-Headers-&linux-version2;</title>
    1212
    1313  <indexterm zone="ch-system-linux-headers">

  • BOOK/system-config/common/udev.xml

    rc5afbba r7f8996d  
    202202      bus driver properly exports the necessary aliases to <systemitem
    203203      class="filesystem">sysfs</systemitem>. In other cases, one should
    204       arrange module loading by other means. With
    205       Linux-&linux-version;-&linux-version2;, Udev is known to load
    206       properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
     204      arrange module loading by other means. With Linux-&linux-version2;, Udev
     205      is known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
    207206      SERIO and FireWire devices.</para>
    208207
    … …  
    222221      directory under <filename class="directory">/sys/bus</filename>, this
    223222      means that the kernel developers have not yet added modalias support to
    224       this bus type. With Linux-&linux-version;-&linux-version2;, this is the
     223      this bus type. With Linux-&linux-version2;, this is the
    225224      case with ISA busses. Expect this issue to be fixed in later kernel
    226225      versions.</para>
Note: See TracChangeset for help on using the changeset viewer.