Index: BOOK/boot/mips/colo.xml
===================================================================
--- BOOK/boot/mips/colo.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/boot/mips/colo.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -33,6 +33,6 @@
# load linux
#
-lcd 'Booting &linux-version;-&linux-version2;...'
-load vmlinux-&linux-version;-&linux-version2;.gz
+lcd 'Booting &linux-version2;...'
+load vmlinux-&linux-version2;.gz
execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
EOF
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/boot/mips/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
-
Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -90,6 +90,6 @@
mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/vmlinux-&linux-version;-&linux-version2;
-gzip -9 /tools/boot/vmlinux-&linux-version;-&linux-version2;
+cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
+gzip -9 /tools/boot/vmlinux-&linux-version2;
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -94,6 +94,6 @@
mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/vmlinux-&linux-version;-&linux-version2;
-gzip -9 /tools/boot/vmlinux-&linux-version;-&linux-version2;
+cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
+gzip -9 /tools/boot/vmlinux-&linux-version2;
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -95,5 +95,5 @@
mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -94,5 +94,5 @@
mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -90,5 +90,5 @@
mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/boot/sparc64/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -92,5 +92,5 @@
mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;
mkdir -pv /tools/boot
-cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;
+cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;
-cp -v System.map /tools/boot/System.map-&linux-version;-&linux-version2;
+cp -v System.map /tools/boot/System.map-&linux-version2;
-cp -v .config /tools/boot/config-&linux-version;-&linux-version2;
+cp -v .config /tools/boot/config-&linux-version2;
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/boot/x86_64/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -94,5 +94,5 @@
mkdir -pv /tools/boot
-cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;
+cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;
dvhtool --unix-to-vh /usr/lib/arcload/sash sash
dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version;-&linux-version2; &linux-version;-&linux-version2;
+dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;
Index: BOOK/bootable/mips/colo.xml
===================================================================
--- BOOK/bootable/mips/colo.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/mips/colo.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -41,6 +41,6 @@
# load linux
#
-lcd 'Booting &linux-version;-&linux-version2;...'
-load vmlinux-&linux-version;-&linux-version2;.gz
+lcd 'Booting &linux-version2;...'
+load vmlinux-&linux-version2;.gz
execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
EOF
Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/mips/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -102,6 +102,6 @@
xpointer="xpointer(//*[@os='v'])"/>
-cp -v vmlinux /boot/vmlinux-&linux-version;-&linux-version2;
-gzip -9 /boot/vmlinux-&linux-version;-&linux-version2;
+cp -v vmlinux /boot/vmlinux-&linux-version2;
+gzip -9 /boot/vmlinux-&linux-version2;
dvhtool --unix-to-vh /usr/lib/arcload/sash64 sash64
dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version;-&linux-version2; &linux-version;-&linux-version2;
+dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;
Index: BOOK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/ppc/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -114,5 +114,5 @@
xpointer="xpointer(//*[@os='v'])"/>
-cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;
+cp -v vmlinux /boot/clfskernel-&linux-version2;
device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:
for the disk, and
- image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;-&linux-version2;
+ image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version2;
which definitely works.
@@ -113,5 +113,5 @@
# 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
Index: BOOK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/sparc/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -106,5 +106,5 @@
xpointer="xpointer(//*[@os='v'])"/>
-cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;
+cp -v vmlinux /boot/clfskernel-&linux-version2;
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/x86/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -132,5 +132,5 @@
Issue the following command to install the kernel:
-cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version;-&linux-version2;
+cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;
System.map is a symbol file for the kernel.
@@ -139,5 +139,5 @@
kernel. Issue the following command to install the map file:
-cp -v System.map /boot/System.map-&linux-version;-&linux-version2;
+cp -v System.map /boot/System.map-&linux-version2;
The kernel configuration file .config
@@ -146,5 +146,5 @@
It is a good idea to keep this file for future reference:
-cp -v .config /boot/config-&linux-version;-&linux-version2;
+cp -v .config /boot/config-&linux-version2;
It is important to note that the files in the kernel source
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/x86_64/kernel.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-&linux-version;-&linux-version2;
+ Linux-&linux-version2;
@@ -106,5 +106,5 @@
xpointer="xpointer(//*[@os='v'])"/>
-cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version;-&linux-version2;
+cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/cross-tools/ppc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/ppc/linux-headers.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/ppc/linux-headers.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/cross-tools/sparc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc/linux-headers.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/sparc/linux-headers.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-headers.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/sparc64/linux-headers.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/cross-tools/x86/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86/linux-headers.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/x86/linux-headers.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/cross-tools/x86_64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/linux-headers.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/x86_64/linux-headers.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/final-system/common/linux-headers.xml
===================================================================
--- BOOK/final-system/common/linux-headers.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/final-system/common/linux-headers.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
- Linux-Headers-&linux-version;-&linux-version2;
+ Linux-Headers-&linux-version2;
Index: BOOK/system-config/common/udev.xml
===================================================================
--- BOOK/system-config/common/udev.xml (revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/system-config/common/udev.xml (revision 7f8996debe3e62770996514962653c9886835674)
@@ -202,7 +202,6 @@
bus driver properly exports the necessary aliases to sysfs. In other cases, one should
- arrange module loading by other means. With
- Linux-&linux-version;-&linux-version2;, Udev is known to load
- properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
+ arrange module loading by other means. With Linux-&linux-version2;, Udev
+ is known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
SERIO and FireWire devices.
@@ -222,5 +221,5 @@
directory under /sys/bus, this
means that the kernel developers have not yet added modalias support to
- this bus type. With Linux-&linux-version;-&linux-version2;, this is the
+ this bus type. With Linux-&linux-version2;, this is the
case with ISA busses. Expect this issue to be fixed in later kernel
versions.