r733 - in trunk/BOOK: . final-system final-system/mips final-system/mips64 introduction/mips introduction/mips64 introduction/mips64-64 materials/mips materials/mips64 materials/mips64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Nov 20 14:13:41 PST 2005


Author: jim
Date: 2005-11-20 15:13:32 -0700 (Sun, 20 Nov 2005)
New Revision: 733

Removed:
   trunk/BOOK/final-system/mips/procps.xml
   trunk/BOOK/final-system/mips64/procps-64bit.xml
   trunk/BOOK/final-system/mips64/procps.xml
Modified:
   trunk/BOOK/
   trunk/BOOK/final-system/mips-chapter.xml
   trunk/BOOK/final-system/mips64-chapter.xml
   trunk/BOOK/final-system/mips64/procps-n32.xml
   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
Log:
 r745 at server:  jim | 2005-11-20 14:04:34 -0800
 Removed mips procps patch. No longer required. Fixed upstream



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

Deleted: trunk/BOOK/final-system/mips/procps.xml
===================================================================
--- trunk/BOOK/final-system/mips/procps.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/final-system/mips/procps.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -1,44 +0,0 @@
-<?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-system-procps" role="wrap">
-  <?dbhtml filename="procps.html"?>
-
-  <title>Procps-&procps-version;</title>
-
-  <indexterm zone="ch-system-procps">
-    <primary sortas="a-Procps">Procps</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <para os="a">The patch below fixes an issue with Procps. Without this
-    patch when the command <command>ps aux</command> is run you will
-    receive a signal 11.</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&procps-mips-patch;</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(id('contents-procps'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips-chapter.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/final-system/mips-chapter.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -52,7 +52,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>

Deleted: trunk/BOOK/final-system/mips64/procps-64bit.xml
===================================================================
--- trunk/BOOK/final-system/mips64/procps-64bit.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/final-system/mips64/procps-64bit.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -1,46 +0,0 @@
-<?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-system-procps" role="wrap">
-  <?dbhtml filename="procps-64bit.html"?>
-
-  <title>Procps-&procps-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-procps">
-    <primary sortas="a-Procps">Procps</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="procps.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install lib64=lib64</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(id('contents-procps'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64/procps-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/procps-n32.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/final-system/mips64/procps-n32.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -22,14 +22,6 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="procps.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>

Deleted: trunk/BOOK/final-system/mips64/procps.xml
===================================================================
--- trunk/BOOK/final-system/mips64/procps.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/final-system/mips64/procps.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -1,51 +0,0 @@
-<?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-system-procps-32" role="wrap">
-  <?dbhtml filename="procps.html"?>
-
-  <title>Procps-&procps-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-procps-32">
-    <primary sortas="a-Procps">Procps</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/procps.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install lib64=lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-procps" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/final-system/mips64-chapter.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -72,9 +72,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/procps-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/procps-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow-n32.xml"/>

Modified: trunk/BOOK/introduction/mips/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips/changelog.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/introduction/mips/changelog.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 20, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed mips procps patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 11, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 20, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed mips procps patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 15, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 20, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed mips procps patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 11, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/mips/patches.xml
===================================================================
--- trunk/BOOK/materials/mips/patches.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/materials/mips/patches.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -112,14 +112,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry os="procps-mips-patch">
-      <term>Procps Signal 11 Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;procps/&procps-mips-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
 </sect1>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/materials/mips64/patches.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -76,10 +76,6 @@
     href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='perl-lib64-patch'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='procps-mips-patch'])"/>
-
     <varlistentry os="util-linux-mips64-patch">
       <term>Util-linux MIPS64 Patch - 1 KB:</term> <listitem>
         <para><ulink

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2005-11-20 22:13:32 UTC (rev 733)
@@ -69,10 +69,6 @@
     xpointer="xpointer(//*[@os='module-init-tools-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='procps-mips-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips64/patches.xml"
     xpointer="xpointer(//*[@os='util-linux-mips64-patch'])"/>
 

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-11-20 20:22:05 UTC (rev 732)
+++ trunk/BOOK/patches.ent	2005-11-20 22:13:32 UTC (rev 733)
@@ -115,8 +115,6 @@
 
 <!ENTITY module-init-tools-mips_update-patch "module-init-tools-&module-init-tools-version;-mips_config_update-1.patch">
 
-<!ENTITY procps-mips-patch "procps-&procps-version;-fix_mips-1.patch">
-
 <!ENTITY util-linux-mips64-patch "util-linux-&util-linux-version;-mips64_fix-1.patch">
 
 <!-- Start of Alpha patches -->




More information about the cross-lfs mailing list