r964 - in trunk/BOOK: . introduction/mips introduction/mips64 introduction/mips64-64 materials/mips materials/mips64 materials/mips64-64 testsuite-tools testsuite-tools/mips testsuite-tools/mips64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Dec 26 22:56:43 PST 2005


Author: jim
Date: 2005-12-26 23:56:39 -0700 (Mon, 26 Dec 2005)
New Revision: 964

Added:
   trunk/BOOK/testsuite-tools/mips/
   trunk/BOOK/testsuite-tools/mips/expect.xml
   trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml
Removed:
   trunk/BOOK/testsuite-tools/64/
Modified:
   trunk/BOOK/
   trunk/BOOK/introduction/mips/changelog.xml
   trunk/BOOK/introduction/mips64-64/changelog.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/materials/mips/patches.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/patches.ent
   trunk/BOOK/testsuite-tools/mips-chapter.xml
   trunk/BOOK/testsuite-tools/mips64-64-chapter.xml
   trunk/BOOK/testsuite-tools/mips64-chapter.xml
Log:
 r1198 at server:  jim | 2005-12-26 22:35:24 -0800
 Expect update for MIPS



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1197
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1198
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/introduction/mips/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips/changelog.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/introduction/mips/changelog.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>December 26, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added config update patch to Expect.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 23, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>December 26, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added config update patch to Expect.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 09, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>December 26, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added config update patch to Expect.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 23, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/materials/mips/patches.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -28,6 +28,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry os="expect-mips_update-patch">
+      <term>Expect Config Update Patch - 51 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;expect/&expect-mips_update-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry os="file-mips_update-patch">
       <term>File Config Update Patch - 35 KB:</term>
       <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/materials/mips64/patches.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -33,6 +33,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='expect-mips_update-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -26,6 +26,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='expect-mips_update-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/patches.ent	2005-12-27 06:56:39 UTC (rev 964)
@@ -100,6 +100,8 @@
 
 <!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
 
+<!ENTITY expect-mips_update-patch "expect-&expect-version;-mips_config_update-1.patch">
+
 <!ENTITY flex-mips_update-patch "flex-&flex-version;-mips_config_update-1.patch">
 
 <!ENTITY file-mips_update-patch "file-&file-version;-mips_config_update-1.patch">

Added: trunk/BOOK/testsuite-tools/mips/expect.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips/expect.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/testsuite-tools/mips/expect.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-expect" role="wrap">
+  <?dbhtml filename="expect.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Expect package contains a program for carrying out scripted
+    dialogues with other interactive programs.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils,
+        GCC, Glibc, Grep, Make, Sed, and Tcl</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <para os="p1">This patch updates config.guess and config.sub for MIPS processors.</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&expect-mips_update-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
+
+</sect1>

Modified: trunk/BOOK/testsuite-tools/mips-chapter.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips-chapter.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/testsuite-tools/mips-chapter.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
 

Added: trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-expect" role="wrap">
+  <?dbhtml filename="expect64.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/expect.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/expect.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
+   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
+   --libdir=/tools/lib64 --with-x=no</userinput></screen>
+
+    <variablelist os="e">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry os="e1">
+        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
+        <listitem>
+          <para>This ensures that the configure script finds the Tcl
+          installation in the temporary tools location.</para>
+        </listitem>
+      </varlistentry>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e2'])"/>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e3'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
+
+</sect1>

Modified: trunk/BOOK/testsuite-tools/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips64-64-chapter.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/testsuite-tools/mips64-64-chapter.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -12,8 +12,8 @@
   <title>Constructing Testsuite Tools</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
 

Modified: trunk/BOOK/testsuite-tools/mips64-chapter.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips64-chapter.xml	2005-12-27 06:56:29 UTC (rev 963)
+++ trunk/BOOK/testsuite-tools/mips64-chapter.xml	2005-12-27 06:56:39 UTC (rev 964)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/expect-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
 




More information about the cross-lfs mailing list