Gentoo Archives: gentoo-doc-cvs

From: Joseph Jezak <josejx@××××××××××××.org>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] cvs commit: handbook-ppc.xml hb-install-ppc-bootloader.xml hb-install-ppc-kernel.xml
Date: Mon, 02 Apr 2007 04:46:04
Message-Id: E1HYEQH-0005gr-Vh@stork.gentoo.org
1 josejx 07/04/02 04:45:41
2
3 Modified: handbook-ppc.xml hb-install-ppc-bootloader.xml
4 hb-install-ppc-kernel.xml
5 Log:
6 Updated to use keyval.
7
8 Revision Changes Path
9 1.40 xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml?rev=1.40&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml?rev=1.40&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml?r1=1.39&r2=1.40
14
15 Index: handbook-ppc.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml,v
18 retrieving revision 1.39
19 retrieving revision 1.40
20 diff -u -r1.39 -r1.40
21 --- handbook-ppc.xml 2 Apr 2007 02:26:57 -0000 1.39
22 +++ handbook-ppc.xml 2 Apr 2007 04:45:41 -0000 1.40
23 @@ -1,16 +1,16 @@
24 <?xml version='1.0' encoding='UTF-8'?>
25 <!DOCTYPE book SYSTEM "/dtd/book.dtd">
26
27 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml,v 1.39 2007/04/02 02:26:57 nightmorph Exp $ -->
28 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/handbook-ppc.xml,v 1.40 2007/04/02 04:45:41 josejx Exp $ -->
29
30 <book link="/doc/en/handbook/handbook-ppc.xml">
31 <title>Gentoo Linux PPC Handbook</title>
32
33 <values>
34 <key id="arch">PPC</key>
35 - <key id="/boot">/dev/hda1</key>
36 - <key id="kernel-version">2.6.19-r7</key>
37 - <key id="kernel-name">kernel-2.6.19-gentoo-r7</key>
38 + <key id="kernel-version">2.6.19-r5</key>
39 + <key id="kernel-name">kernel-2.6.19-gentoo-r5</key>
40 + <key id="kernel-gentoo">2.6.19-gentoo-r5</key>
41 <key id="online-book">handbook-ppc.xml</key>
42 <key id="release-dir">releases/ppc/2007.0/ppc32/</key>
43 <key id="stage3">stage3-ppc-2007.0.tar.bz2</key>
44
45
46
47 1.30 xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml
48
49 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml?rev=1.30&view=markup
50 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml?rev=1.30&content-type=text/plain
51 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml?r1=1.29&r2=1.30
52
53 Index: hb-install-ppc-bootloader.xml
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml,v
56 retrieving revision 1.29
57 retrieving revision 1.30
58 diff -u -r1.29 -r1.30
59 --- hb-install-ppc-bootloader.xml 2 Apr 2007 02:22:45 -0000 1.29
60 +++ hb-install-ppc-bootloader.xml 2 Apr 2007 04:45:41 -0000 1.30
61 @@ -4,7 +4,7 @@
62 <!-- The content of this document is licensed under the CC-BY-SA license -->
63 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
64
65 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml,v 1.29 2007/04/02 02:22:45 josejx Exp $ -->
66 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-bootloader.xml,v 1.30 2007/04/02 04:45:41 josejx Exp $ -->
67
68 <sections>
69
70 @@ -79,14 +79,14 @@
71 <pre caption="Adding genkernel boot arguments to yaboot.conf">
72 <comment>###########################################################
73 ## This section can be duplicated if you have more than one
74 -## kernel or set of boot options - replace vmlinux and initrd
75 +## kernel or set of boot options - replace the image and initrd
76 ## with the exact filename of your kernel and initrd image.
77 ###########################################################</comment>
78 -image=/boot/vmlinux
79 +image=/boot/kenrel-genkernel-ppc-<keyval id="kernel-gentoo"/>
80 label=Linux
81 root=/dev/ram0
82 partition=3
83 - initrd=/boot/initrd
84 + initrd=/boot/initramfs-genkernel-ppc-<keyval id="kernel-gentoo"/>
85 <comment># You can add additional kernel arguments to append such as
86 # rootdelay=10 for a USB/Firewire Boot</comment>
87 append="real_root=/dev/hda3 init=/linuxrc"
88 @@ -217,11 +217,12 @@
89 install=/usr/lib/yaboot/yaboot
90 magicboot=/usr/lib/yaboot/ofboot
91
92 -<comment>#################
93 -## This section can be duplicated if you have more than one kernel or set of
94 -## boot options - replace vmlinux with your kernel version
95 -#################</comment>
96 -image=/boot/vmlinux
97 +<comment>############################################################
98 +## This section can be duplicated if you have more than one
99 +## kernel or set of boot options - replace the image variable
100 +## with the exact filename of your kernel.
101 +###########################################################</comment>
102 +image=/boot/<keyval id="kernel-name"/>
103 label=Linux
104 root=/dev/hda3
105 partition=3
106 @@ -280,7 +281,7 @@
107 # <i>exit</i>
108 cdimage ~# <i>mkdir /mnt/mac</i>
109 cdimage ~# <i>mount /dev/sda6 /mnt/mac -t hfs</i>
110 -cdimage ~# <i>cp /mnt/gentoo/usr/src/linux/vmlinux "/mnt/mac/System Folder/Linux Kernels"</i>
111 +cdimage ~# <i>cp /mnt/gentoo/usr/src/linux/vmlinux "/mnt/mac/System Folder/Linux Kernels/<keyval id="kernel-name"/>"</i>
112 </pre>
113
114 <p>
115 @@ -292,8 +293,8 @@
116 # <i>exit</i>
117 cdimage ~# <i>mkdir /mnt/mac</i>
118 cdimage ~# <i>mount /dev/sda6 /mnt/mac -t hfs</i>
119 -cdimage ~# <i>cp /mnt/gentoo/boot/kernel-* "/mnt/mac/System Folder/Linux Kernels"</i>
120 -cdimage ~# <i>cp /mnt/gentoo/boot/initramfs-* "/mnt/mac/System Folder"</i>
121 +cdimage ~# <i>cp /mnt/gentoo/boot/kernel-genkernel-ppc-<keyval id="kernel-gentoo"/> "/mnt/mac/System Folder/Linux Kernels"</i>
122 +cdimage ~# <i>cp /mnt/gentoo/boot/initramfs-genkernel-ppc-<keyval id="kernel-gentoo"/> "/mnt/mac/System Folder"</i>
123 </pre>
124
125 <p>
126 @@ -368,11 +369,13 @@
127 <pre caption="Configuring quik.conf">
128 # Example of quik.conf
129 init-message = "Gentoo 2007.0\n"
130 -partition = 2 <comment># This is the boot partition</comment>
131 +<comment># This is the boot partition</comment>
132 +partition = 2
133 root = /dev/hda4
134 timeout = 30
135 default = gentoo
136 -image = /vmlinux <comment># This is your kernel</comment>
137 +<comment># This is your kernel</comment>
138 +image = /<keyval id="kernel-name"/>
139 label = gentoo
140 </pre>
141
142 @@ -400,7 +403,7 @@
143 # <i>nvsetenv input-device kbd</i>
144 # <i>nvsetenv boot-device scsi/sd@1:0</i> <comment># For SCSI</comment>
145 # <i>nvsetenv boot-device ata/ata-disk@0:0</i> <comment># For ATA</comment>
146 -# <i>nvsetenv boot-file /boot/vmlinux-<keyval id="kernel-version"/> root=/dev/hda4</i> <comment>First item is the path to the kernel, the second is the root partition. You may append any kernel options to the end of this line.</comment>
147 +# <i>nvsetenv boot-file /boot/<keyval id="kernel-name"/> root=/dev/hda4</i> <comment>First item is the path to the kernel, the second is the root partition. You may append any kernel options to the end of this line.</comment>
148 # <i>nvsetenv boot-command boot</i> <comment># Set this to bye for MacOS and boot for Linux</comment>
149 </pre>
150
151 @@ -488,11 +491,11 @@
152
153 [SECTION]
154 Local HD -> Linux (Normal)
155 -ide:0 vmlinux video=radeonfb:1024x768@70 root=/dev/hda3
156 +ide:0 <keyval id="kernel-name"/> video=radeonfb:1024x768@70 root=/dev/hda3
157
158 [SECTION]
159 Local HD -> Genkernel (Normal)
160 -ide:0 vmlinux root=/dev/ram0 real_root=/dev/hda3 init=/linuxrc initrd=initrd
161 +ide:0 kernel-genkernel-ppc-<keyval id="kernel-gentoo"/> root=/dev/ram0 real_root=/dev/hda3 init=/linuxrc initrd=initramfs-genkernel-ppc<keyval id="kernel-gentoo"/>
162 </pre>
163
164 <p>
165
166
167
168 1.36 xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml
169
170 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml?rev=1.36&view=markup
171 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml?rev=1.36&content-type=text/plain
172 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml?r1=1.35&r2=1.36
173
174 Index: hb-install-ppc-kernel.xml
175 ===================================================================
176 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml,v
177 retrieving revision 1.35
178 retrieving revision 1.36
179 diff -u -r1.35 -r1.36
180 --- hb-install-ppc-kernel.xml 2 Apr 2007 02:42:14 -0000 1.35
181 +++ hb-install-ppc-kernel.xml 2 Apr 2007 04:45:41 -0000 1.36
182 @@ -4,7 +4,7 @@
183 <!-- The content of this document is licensed under the CC-BY-SA license -->
184 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
185
186 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml,v 1.35 2007/04/02 02:42:14 josejx Exp $ -->
187 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/draft/hb-install-ppc-kernel.xml,v 1.36 2007/04/02 04:45:41 josejx Exp $ -->
188
189 <sections>
190
191 @@ -63,7 +63,7 @@
192
193 <pre caption="Viewing the kernel source symlink">
194 # <i>ls -l /usr/src/linux</i>
195 -lrwxrwxrwx 1 root root 22 Mar 18 16:23 /usr/src/linux -&gt; linux-<keyval id="kernel-version"/>
196 +lrwxrwxrwx 1 root root 22 Mar 18 16:23 /usr/src/linux -&gt; linux-<keyval id="kernel-gentoo"/>
197 </pre>
198
199 <p>
200 @@ -328,9 +328,9 @@
201
202 <pre caption="Installing the kernel">
203 # <i>cd /usr/src/linux</i>
204 -<comment>replace &lt;kernel-version&gt; with your kernel version</comment>
205 +<comment>Note, your kernel version might be different</comment>
206 <comment>(Apple/IBM)</comment>
207 -# <i>cp vmlinux /boot/&lt;kernel-version&gt;</i>
208 +# <i>cp vmlinux /boot/<keyval id="kernel-name"/></i>
209 <comment>(Pegasos)</comment>
210 # <i>cp arch/powerpc/boot/images/zImage /boot/&lt;kernel-version&gt;</i>
211 </pre>
212 @@ -477,7 +477,8 @@
213 </p>
214
215 <pre caption="Checking the created kernel image name and initrd">
216 -# <i>ls /boot/kernel* /boot/initramfs*</i>
217 +<comment>Note, your kernel version might be different</comment>
218 +# <i>ls /boot/kernel-genkernel-ppc-<keyval id="kernel-gentoo"/> /boot/initramfs-genkernel-ppc-<keyval id="kernel-gentoo"/></i>
219 </pre>
220
221 <p>
222
223
224
225 --
226 gentoo-doc-cvs@g.o mailing list