Changeset 47dbf9a

Timestamp:

Sep 13, 2006, 2:28:10 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

4645af77

Parents:

c2603e6

Message:

Applied r2632 from trunk to the clfs-1.0 branch.

Location:

final-system

Files:

• common/perl.xml (modified) (1 diff)
• multilib/perl-64bit.xml (modified) (1 diff)
• multilib/perl-n32.xml (modified) (1 diff)
• multilib/perl.xml (modified) (1 diff)

final-system/common/perl.xml

@@ -33 +33 @@
     -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH</userinput></screen>
 
-    <para os="a00">Before starting to configure, create a basic
+    <note os="a00">
+      <para>If you are following the boot method you will need to enable the
+      loopback device as well as set a hostname for some of the tests:</para>
+
+      <screen><userinput>ip link set lo up
+hostname clfs</userinput></screen>
+    </note>
+
+    <para os="a01">Before starting to configure, create a basic
     <filename>/etc/hosts</filename> file which will be referenced in one
     of Perl's configuration files as well as being used used by the testsuite
     if you run that:</para>
 
-<screen os="a01"><userinput>echo "127.0.0.1 localhost clfs" &gt; /etc/hosts</userinput></screen>
-
-    <para os="a02">We also have to enable the loopback interface, this
-    will prevent some perl networking testsuite failures:</para>
-
-<screen os="a03"><userinput>ip link set lo up</userinput></screen>
-
-    <para os="a04">We also have to set the hostname for some of the
-    test:</para>
-
-<screen os="a05"><userinput>hostname clfs</userinput></screen>
+<screen os="a02"><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
     <para os="a">To have full control over the way Perl is set up, you can

final-system/multilib/perl-64bit.xml

@@ -45 +45 @@
 
 <screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a00'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a01'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a02'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a03'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a04'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a05'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/multilib/perl-n32.xml

@@ -48 +48 @@
 
 <screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >>hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a00'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a01'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a02'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a03'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a04'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a05'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/multilib/perl.xml

@@ -42 +42 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='a02'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a03'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a04'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a05'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"