Changeset 7349750 for BOOK/bootable/ppc

Timestamp:

Jul 2, 2014, 5:13:40 PM (10 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

894a975

Parents:

1e452cd

git-author:

William Harrington <kb0iic@…> (07/02/14 17:12:18)

git-committer:

William Harrington <kb0iic@…> (07/02/14 17:13:40)

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/bootable/ppc

Files:

• kernel.xml (modified) (2 diffs)
• yaboot.xml (modified) (2 diffs)

BOOK/bootable/ppc/kernel.xml

@@ -9 +9 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -114 +114 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/bootable/ppc/yaboot.xml

@@ -63 +63 @@
   <parameter>device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:</parameter>
   for the disk, and
-  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;-&linux-version2;</parameter>
+  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version2;</parameter>
   which definitely works.</para>
 
@@ -113 +113 @@
 # on which they are situated and can include at most one
 # directory
-image=/boot/clfskernel-&linux-version;-&linux-version2;
+image=/boot/clfskernel-&linux-version2;
     label=&version;
     read-only</literal>