nightmorph 07/03/31 04:36:53
Modified: hb-install-config.xml hb-install-finalise.xml
hb-install-stage.xml
Log:
added conditionals to config and stage, now to add them to the rest of the
arch handbooks
Revision Changes Path
1.3 xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml
file :
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml?r1=1.2&r2=1.3
Index: hb-install-config.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hb-install-config.xml 20 Mar 2007 05:24:48 -0000 1.2
+++ hb-install-config.xml 31 Mar 2007 04:36:53 -0000 1.3
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml,v
1.2 2007/03/20 05:24:48 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-config.xml,v
1.3 2007/03/31 04:36:53 nightmorph Exp $ -->
<sections>
@@ -67,32 +67,39 @@
</li>
</ul>
-<p>
+<impo>
The default <path>/etc/fstab</path> file provided by Gentoo <e>is not a valid
-fstab file</e>, so start <c>nano</c> (or your favorite editor) to create your
-<path>/etc/fstab</path>:
-</p>
+fstab file</e>. You <b>have to create</b> your own <path>/etc/fstab</path>.
+</impo>
<pre caption="Opening /etc/fstab">
# <i>nano -w /etc/fstab</i>
</pre>
+</body>
+<body test="func:keyval('/boot')">
+
<p>
Let us take a look at how we write down the options for the <path>/boot</path>
-partition. If your architecture doesn't require a seperate <path>/boot</path>
-partition (such as Apple PowerPC machines) or you have elected not to create
-one, don't include a boot line in your fstab. The Apple Bootstrap partition
-is not a <path>/boot</path> partition.
+partition. This is just an example, if you didn't or couldn't create a
+<path>/boot</path>, don't copy it.
</p>
-<p>
-In our default x86 partitioning example <path>/boot</path> is the
-<path>/dev/hda1</path> partition, with <c>ext2</c> as filesystem.
-It needs to be checked during boot, so we would write down:
+<p test="contains(func:keyval('/boot'), '/dev/hd')">
+In our default <keyval id="arch"/> partitioning example, <path>/boot</path> is
+usually the <path><keyval id="/boot"/></path> partition (or
+<path>/dev/sda*</path> if you use SCSI or SATA drives), with <c>ext2</c> as
+filesystem. It needs to be checked during boot, so we would write down:
+</p>
+
+<p test="contains(func:keyval('/boot'), '/dev/sd')">
+In our default <keyval id="arch"/> partitioning example, <path>/boot</path> is
+usually the <path><keyval id="/boot"/></path> partition, with <c>ext2</c> as
+filesystem. It needs to be checked during boot, so we would write down:
</p>
<pre caption="An example /boot line for /etc/fstab">
-/dev/hda1 /boot ext2 defaults 1 2
+<keyval id="/boot"/> /boot ext2 defaults 1 2
</pre>
<p>
@@ -102,42 +109,95 @@
manually mount this partition every time you want to use it.
</p>
-<p>
-Now, to improve performance, most users would want to add the <c>noatime</c>
-option as mountoption, which results in a faster system since access times
-aren't registered (you don't need those generally anyway):
+</body>
+<body>
+
+<p test="not(func:keyval('arch')='SPARC')">
+Add the rules that match your partitioning scheme and append rules for
+<path>/proc</path>, <c>tmpfs</c>, for your CD-ROM drive(s), and of course, if
+you have other partitions or drives, for those too.
</p>
-<pre caption="An improved /boot line for /etc/fstab">
-/dev/hda1 /boot ext2 defaults,noatime 1 2
-</pre>
+<p test="func:keyval('arch')='SPARC'">
+Add the rules that match your partitioning schema and append rules for
+<path>/proc/openprom</path>, <path>/proc</path>, <c>tmpfs</c> , for your CD-ROM
+drive(s), and of course, if you have other partitions or drives, for those too.
+</p>
<p>
-If we continue with this, we would end up with the following three lines (for
-<path>/boot</path>, <path>/</path> and the swap partition):
+Now use the <e>example</e> below to create your <path>/etc/fstab</path>:
</p>
-<pre caption="Three /etc/fstab lines">
-/dev/hda1 /boot ext2 defaults,noatime 1 2
-/dev/hda2 none swap sw 0 0
-/dev/hda3 / ext3 noatime 0 1
+<pre caption="A full /etc/fstab example" test="func:keyval('arch')='AMD64' or
func:keyval('arch')='x86'">
+<keyval id="/boot"/> /boot ext2 defaults,noatime 1 2
+/dev/hda2 none swap sw 0 0
+/dev/hda3 / ext3 noatime 0 1
+
+proc /proc proc nodev,nosuid,noexec 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+
+/dev/cdrom /mnt/cdrom auto noauto,user 0 0
</pre>
-<p>
-To finish up, you should add a rule for <path>/proc</path>, <c>tmpfs</c>
-(required) and for your CD-ROM drive (and of course, if you have other
-partitions or drives, for those too):
-</p>
+<pre caption="A full /etc/fstab example" test="func:keyval('arch')='HPPA'">
+<keyval id="/boot"/> /boot ext2 defaults,noatime 1 2
+/dev/sda3 none swap sw 0 0
+/dev/sda4 / ext3 noatime 0 1
+
+proc /proc proc nodev,nosuid,noexec 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+
+/dev/cdrom /mnt/cdrom auto noauto,user 0 0
+</pre>
+
+<pre caption="A full /etc/fstab example" test="func:keyval('arch')='Alpha' or
func:keyval('arch')='MIPS'">
+<keyval id="/boot"/> /boot ext2 defaults,noatime 1 2
+/dev/sda2 none swap sw 0 0
+/dev/sda3 / ext3 noatime 0 1
+
+proc /proc proc nodev,nosuid,noexec 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+
+/dev/cdrom /mnt/cdrom auto noauto,user 0 0
+</pre>
-<pre caption="A full /etc/fstab example">
-/dev/hda1 /boot ext2 defaults,noatime 1 2
-/dev/hda2 none swap sw 0 0
-/dev/hda3 / ext3 noatime 0 1
+<pre caption="A full /etc/fstab example" test="func:keyval('arch')='SPARC'">
+/dev/sda1 / ext3 noatime 0 1
+/dev/sda2 none swap sw 0 0
+/dev/sda4 /usr ext3 noatime 0 2
+/dev/sda5 /var ext3 noatime 0 2
+/dev/sda6 /home ext3 noatime 0 2
-proc /proc proc nodev,nosuid,noexec 0 0
-shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+openprom /proc/openprom openpromfs defaults 0 0
+proc /proc proc nodev,nosuid,noexec 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
-/dev/cdroms/cdrom0 /mnt/cdrom auto noauto,user 0 0
+/dev/cdrom /mnt/cdrom auto noauto,user 0 0
+</pre>
+
+<note test="func:keyval('arch')='PPC'">
+There are important variations between PPC machine types. Please make sure you
+adapt the following example to your system.
+</note>
+
+<pre caption="A full /etc/fstab example" test="func:keyval('arch')='PPC'">
+/dev/hda4 / ext3 noatime 0 1
+/dev/hda3 none swap sw 0 0
+
+proc /proc proc nodev,nosuid,noexec 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+
+/dev/cdrom /mnt/cdrom auto noauto,user 0 0
+</pre>
+
+<pre caption="A full /etc/fstab example" test="func:keyval('arch')='PPC64'">
+/dev/sda4 / ext3 noatime 0 1
+/dev/sda3 none swap sw 0 0
+
+proc /proc proc nodev,nosuid,noexec 0 0
+shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
+
+/dev/cdrom /mnt/cdrom auto noauto,user 0 0
</pre>
<p>
@@ -147,16 +207,11 @@
</p>
<p>
-Now use the above example to create your <path>/etc/fstab</path>. If you are a
-<b>SPARC</b>-user, you should add the following line to your
-<path>/etc/fstab</path>
-too:
+To improve performance, most users would want to add the <c>noatime</c>
+mount option, which results in a faster system since access times
+aren't registered (you don't need those generally anyway).
</p>
-<pre caption="Adding openprom filesystem to /etc/fstab">
-openprom /proc/openprom openpromfs defaults 0 0
-</pre>
-
<p>
Double-check your <path>/etc/fstab</path>, save and quit to continue.
</p>
@@ -373,15 +428,15 @@
Save and exit the editor to continue.
</p>
-<p>
+<p test="func:keyval('arch')='AMD64' or func:keyval('arch')='x86' or
substring(func:keyval('arch'),1,3)='PPC'">
If you don't have PCMCIA, you can now continue with <uri
-link="#doc_chap3">System Information</uri>. PCMCIA-users should read the
+link="#sysinfo">System Information</uri>. PCMCIA-users should read the
following topic on PCMCIA.
</p>
</body>
</subsection>
-<subsection>
+<subsection test="func:keyval('arch')='AMD64' or func:keyval('arch')='x86' or
substring(func:keyval('arch'),1,3)='PPC'">
<title>Optional: Get PCMCIA Working</title>
<body>
1.2 xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml
file :
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml?r1=1.1&r2=1.2
Index: hb-install-finalise.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hb-install-finalise.xml 19 Mar 2007 20:37:28 -0000 1.1
+++ hb-install-finalise.xml 31 Mar 2007 04:36:53 -0000 1.2
@@ -4,11 +4,11 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml,v
1.1 2007/03/19 20:37:28 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-finalise.xml,v
1.2 2007/03/31 04:36:53 nightmorph Exp $ -->
<sections>
-<version>7.0</version>
+<version>8.0</version>
<date>2006-08-30</date>
<section>
1.6 xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml
file :
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml?r1=1.5&r2=1.6
Index: hb-install-stage.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hb-install-stage.xml 30 Mar 2007 12:01:19 -0000 1.5
+++ hb-install-stage.xml 31 Mar 2007 04:36:53 -0000 1.6
@@ -4,11 +4,11 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml,v
1.5 2007/03/30 12:01:19 neysx Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/2007.0/hb-install-stage.xml,v
1.6 2007/03/31 04:36:53 nightmorph Exp $ -->
<sections>
-<version>7.1</version>
+<version>8.0</version>
<date>2007-01-31</date>
<section>
@@ -45,19 +45,6 @@
</body>
</subsection>
-<subsection>
-<title>Locating the Stage3 File</title>
-<body>
-
-<p>
-If you have configured networking because you need to download a stage3 file
for
-your architecture, continue with <uri link="#download">Alternative: Using a
-Stage3 from the Internet</uri>. Otherwise read <uri link="#available">Default:
-Using a Stage3 from the Installation CD</uri>.
-</p>
-
-</body>
-</subsection>
</section>
<section id="available">
<title>Default: Using a Stage from the Installation CD</title>
@@ -95,18 +82,18 @@
<p>
We will now extract the stage tarball of your choice. We will do this with the
-<c>tar</c> tool. Make sure you use the same options (<c>xvjpf</c>)! The
-<c>x</c> stands for <e>Extract</e>, the <c>v</c> for <e>Verbose</e> to see what
-happens during the extraction process (this one is optional), the <c>j</c> for
+<c>tar</c> tool. Make sure you use the same options (<c>xvjpf</c>)! The
<c>x</c>
+stands for <e>Extract</e>, the <c>v</c> for <e>Verbose</e> to see what happens
+during the extraction process (this one is optional), the <c>j</c> for
<e>Decompress with bzip2</e>, the <c>p</c> for <e>Preserve permissions</e> and
the <c>f</c> to denote that we want to extract a file, not standard input. In
-the next example, we extract the stage tarball
-<path>stage3-<subarch>-2007.0.tar.bz2</path>. Be sure to substitute
-the tarball filename with your stage.
+the next example, we extract the stage tarball <path><keyval
+id="stage3"/></path>. Be sure to substitute the tarball filename with your
+stage.
</p>
<pre caption="Extracting the stage tarball">
-# <i>tar xvjpf /mnt/cdrom/stages/stage3-<subarch>-2007.0.tar.bz2</i>
+# <i>tar xvjpf /mnt/cdrom/stages/<keyval id="stage3"/></i>
</pre>
<p>
@@ -116,78 +103,6 @@
</body>
</subsection>
-</section>
-<section id="download">
-<title>Alternative: Using a Stage from the Internet</title>
-<subsection>
-<title>Downloading the Stage Tarball</title>
-<body>
-
-<p>
-Go to the Gentoo mountpoint at which you mounted your filesystems
-(most likely <path>/mnt/gentoo</path>):
-</p>
-
-<pre caption="Going to the Gentoo mountpoint">
-# <i>cd /mnt/gentoo</i>
-</pre>
-
-<p>
-Depending on your installation medium, you have a couple of tools available to
-download a stage. If you have <c>links</c> available, then you can immediately
-surf to <uri link="/main/en/mirrors.xml">the Gentoo mirrorlist</uri> and
-choose a mirror close to you.
-</p>
-
-<p>
-If you don't have <c>links</c> available you should have <c>lynx</c> at your
-disposal. If you need to go through a proxy, export the <c>http_proxy</c> and
-<c>ftp_proxy</c> variables:
-</p>
-
-<pre caption="Setting proxy information for lynx">
-# <i>export http_proxy="http://proxy.server.com:port";</i>
-# <i>export ftp_proxy="http://proxy.server.com:port";</i>
-</pre>
-
-<p>
-We will now assume that you have <c>links</c> at your disposal.
-</p>
-
-<p>
-Pick the <path>releases/</path> directory, followed by your architecture (for
-instance <path>x86/</path>) and the Gentoo version (<path>2007.0/</path>) to
-finish up with the <path>stages/</path> directory. There you should see all
-available stage files for your architecture (they might be stored within
-subdirectories named to the individual subarchitectures). Select one and press
-<c>D</c> to download. When you're finished, press <c>Q</c> to quit the browser.
-</p>
-
-<pre caption="Surfing to the mirror listing with links">
-# <i>links http://www.gentoo.org/main/en/mirrors.xml</i>
-
-<comment>(If you need proxy support with links:)</comment>
-# <i>links -http-proxy proxy.server.com:8080
http://www.gentoo.org/main/en/mirrors.xml</i>
-</pre>
-
-<p>
-Make sure you download a stage3 tarball - installations using a stage1 or
stage2
-tarball are not supported anymore.
-</p>
-
-<p>
-If you want to check the integrity of the downloaded stage tarball, use
-<c>md5sum</c> and compare the output with the MD5 checksum provided on the
-mirror. For instance, to check the validity of the x86 stage tarball:
-</p>
-
-<pre caption="Example checking integrity of a stage tarball">
-# <i>md5sum -c stage3-x86-2007.0.tar.bz2.DIGESTS</i>
-stage3-x86-2007.0.tar.bz2: OK
-</pre>
-
-</body>
-</subsection>
<subsection>
<title>Unpacking the Stage Tarball</title>
<body>
@@ -361,30 +276,24 @@
</p>
<p>
-As an example, on the x86 architecture, you will want to set the -march= flag
-as shown below (for an Athlon XP machine):
+A first setting is the <c>-march=</c> or <c>-mcpu=</c> flag, which specifies
+the name of the target architecture. Possible options are described in the
+<path>make.conf.example</path> file (as comments).
</p>
-<pre caption="The GCC march setting">
--march=athlon-xp
-</pre>
-
<p>
A second one is the <c>-O</c> flag (that is a capital O, not a zero),
which specifies the <c>gcc</c> optimization
class flag. Possible classes are <c>s</c> (for size-optimized),
<c>0</c> (zero - for no optimizations), <c>1</c>, <c>2</c> or <c>3</c> for more
speed-optimization flags (every class has the same flags as the one before,
plus
-some extras). For instance, for a class-2 optimization:
+some extras). <c>-O2</c> is the recommended default.
</p>
-<pre caption="The GCC O setting">
--O2
-</pre>
-
<p>
Another popular optimization flag is <c>-pipe</c> (use pipes rather than
temporary files for communication between the various stages of compilation).
+It has no impact on the generated code.
</p>
<p>
@@ -395,12 +304,20 @@
<p>
When you define the <c>CFLAGS</c> and <c>CXXFLAGS</c>, you should combine
-several optimization flags, like in the following example:
+several optimization flags. The default values contained in the stage3 archive
+you unpacked should be good enough. The following example is just an example:
</p>
-<pre caption="Defining the CFLAGS and CXXFLAGS variable">
-CFLAGS="-march=athlon-xp -pipe -O2"
-CXXFLAGS="${CFLAGS}" <comment># Use the same settings for
both variables</comment>
+<pre test="not(func:keyval('arch')='AMD64')" caption="Defining the CFLAGS and
CXXFLAGS variable">
+CFLAGS="<keyval id="CFLAGS"/>"
+<comment># Use the same settings for both variables</comment>
+CXXFLAGS="${CFLAGS}"
+</pre>
+
+<pre test="func:keyval('arch')='AMD64'" caption="Defining the CFLAGS and
CXXFLAGS variable">
+CFLAGS="<keyval id="CFLAGS"/>" <comment># EM64T users should use
-march=nocona</comment>
+<comment># Use the same settings for both variables</comment>
+CXXFLAGS="${CFLAGS}"
</pre>
</body>
--
[email protected] mailing list
