Changeset 6d8b45a3 for general

Timestamp:

12/25/2018 02:35:46 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

b98dbfd

Parents:

3757ae7

Message:

Merge to HEAD 20872.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/BOOK-elogind@20873 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general

Files:

• genlib/libuv.xml (modified) (4 diffs)
• genlib/qca.xml (modified) (1 diff)
• prog/ojdk-conf.xml (modified) (1 diff)
• sysutils/pciutils.xml (modified) (1 diff)
• sysutils/usbutils.xml (modified) (1 diff)

general/genlib/libuv.xml

@@ -95 +95 @@
       commands:
     </para>
+<!--
+Don't use cmake here to avoid circular dependency
 
 <screen><userinput>sed -i "/TARGETS uv_a ARCHIVE/d" CMakeLists.txt &amp;&amp;
@@ -103 +105 @@
 cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
 make </userinput></screen>
+-->
 
+<screen><userinput>sh autogen.sh                              &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
+make </userinput></screen>
+<!--
     <para>
       If you want to run the tests, add -DBUILD_TESTING=true to
       the cmake line above and after building run: 
       <command>make test</command>.
+    </para>
+-->
+    <para>
+      If you want to run the tests, run: <command>make check</command>.
     </para>
 
@@ -118 +129 @@
   </sect2>
 
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -128 +139 @@
     
   </sect2>
-
+-->
   <sect2 role="content">
     <title>Contents</title>

general/genlib/qca.xml

@@ -117 +117 @@
       -DCMAKE_BUILD_TYPE=Release                                 \
       -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man                  \
-      -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0             \
+      <!--      -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0             \
       -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so       \
-      -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so \
+      -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so \ -->
       ..                                                         &amp;&amp;
 

general/prog/ojdk-conf.xml

@@ -109 +109 @@
 
 <screen role="root"><userinput>/usr/sbin/make-ca -g --force &amp;&amp;
-ln -sfv /etc/ssl/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
+ln -sfv /etc/pki/tls/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
 
     <para>

general/sysutils/pciutils.xml

@@ -148 +148 @@
     </para>
 
-    <para revision="sysv">
-      You may wish to add an entry to
-      <systemitem class="username">root</systemitem>'s (or any other user who has
-      write privilege to <filename class="directory">/usr/share/hwdata</filename>)
-      crontab to automatically update the <filename>pci.ids</filename> file
-      periodically.
-    </para>
-
-    <para revision="systemd">
+    <para>
       You should update the <filename>/usr/share/hwdata/pci.ids</filename> file
-      periodically. Execute the following commands, as the
-      <systemitem class="username">root</systemitem> user, to create a systemd
-      timer to update it weekly on Sundays at 2:30 A.M. (local time):
-    </para>
+      periodically. <phrase revision="sysv">If you've installed
+      <xref linkend="fcron"/> and completed the section on periodic jobs,
+      execute</phrase><phrase revision="systemd">Execute</phrase> the following
+      commands, as the  <systemitem class="username">root</systemitem> user,
+      to create a <phrase revision="sysv">weekly cron job:</phrase>
+      <phrase revision="systemd">systemd timer to update it weekly on Sundays
+      at 2:30 A.M. (local time):</phrase>
+    </para>
+
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/cron.weekly/update-pciids.sh &lt;&lt; "EOF" &amp;&amp;
+<literal>#!/bin/bash
+/usr/sbin/update-pciids</literal>
+EOF
+chmod 754 /etc/cron.weekly/update-pciids</userinput></screen>
 
 <screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-pciids.service &lt;&lt; "EOF" &amp;&amp;

general/sysutils/usbutils.xml

@@ -153 +153 @@
 <screen role="root" revision="sysv"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
 
-    <para revision="sysv">
-      You may wish to add an entry to
-      <systemitem class="username">root</systemitem>'s (or any other user who has
-      write privilege to <filename class="directory">/usr/share/hwdata</filename>)
-      crontab to automatically update the <filename>usb.ids</filename> file
-      periodically.
-    </para>
-
-    <para revision="systemd">
+    <para>
       You should update the <filename>/usr/share/hwdata/usb.ids</filename> file
-      periodically. Execute the following commands, as the
-      <systemitem class="username">root</systemitem> user, to create a systemd
-      timer to update it weekly on Sundays at 3:00 A.M. (local time):
-    </para>
+      periodically. <phrase revision="sysv">If you've installed
+      <xref linkend="fcron"/> and completed the section on periodic jobs,
+      execute</phrase><phrase revision="systemd">Execute</phrase> the following       commands, as the  <systemitem class="username">root</systemitem> user,
+      to create a <phrase revision="sysv">weekly cron job:</phrase>
+      <phrase revision="systemd">systemd timer to update it weekly on Sundays
+      at 2:30 A.M. (local time):</phrase>
+    </para>
+
+<screen role="root" revision="sysv"><userinput>cat &gt; /etc/cron.weekly/update-
+usbids.sh &lt;&lt; "EOF" &amp;&amp;
+<literal>#!/bin/bash
+/usr/bin/wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</literal>
+EOF
+chmod 754 /etc/cron.weekly/update-usbids</userinput></screen>
 
 <screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;