Changeset 03e6a40 for BOOK/final-system/multilib/procps-ng-64bit.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/multilib/procps-ng-64bit.xml (moved) (moved from BOOK/final-system/multilib/rsyslog.xml ) (1 diff)

BOOK/final-system/multilib/procps-ng-64bit.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
-  <?dbhtml filename="rsyslog.html"?>
+<sect1 id="ch-system-procps-ng" role="wrap">
+  <?dbhtml filename="procps-ng-64bit.html"?>
 
-  <title>Rsyslog-&rsyslog-version;</title>
+  <title>Procps-ng-&procps-ng-version; 64 Bit</title>
 
-  <indexterm zone="ch-system-rsyslog">
-    <primary sortas="a-rsyslog">rsyslog</primary>
+  <indexterm zone="ch-system-procps-ng">
+    <primary sortas="a-Procps-ng">Procps-ng</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
+  href="../common/procps-ng.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Rsyslog</title>
+    <title>Installation of Procps-ng</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --exec-prefix= \
+    --libdir=/usr/lib64 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
+    --disable-kill</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
+    href="../common/procps-ng.xml"
     xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/procps-ng.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
+mv -v /usr/lib64/libprocps.so.* /lib64
+ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
 
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(id('conf-rsyslog'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(id('contents-rsyslog'))"/>
+  href="../common/procps-ng.xml"
+  xpointer="xpointer(id('contents-procps-ng'))"/>
 
 </sect1>