Changeset 1270e6b3

Timestamp:

10/31/2014 12:28:05 AM (9 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

c016e37

Parents:

703ac75

Message:

Merge another update from trunk.

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

Files:

• general/sysutils/usbutils.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/sysutils/usbutils.xml

@@ -92 +92 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr  \
-            --disable-zlib \
-            --datadir=/usr/share/misc &amp;&amp;
+<screen><userinput>sed -i '/^usbids/ s:usb.ids:hwdata/&amp;:' lsusb.py &amp;&amp;
+
+./configure --prefix=/usr --datadir=/usr/share/hwdata &amp;&amp;
 make</userinput></screen>
 
@@ -127 +127 @@
     <para>
       The <filename>usb.ids</filename> data file is constantly being
-      updated. To get a current version of this file, run
-      <command>update-usbids</command> as the <systemitem
-      class="username">root</systemitem> user. This program requires the
-      <xref linkend="which"/> script or program to find <xref linkend="lynx"/>
-      or <xref linkend="wget"/> which are used to download the most current file,
-      and replace the existing file in
-      <filename class="directory">/usr/share/misc</filename>.
-    </para>
+      updated. To get a current version of this file, run, as the <systemitem
+      class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
 
     <para>
       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/misc</filename>)
+      write privilege to <filename class="directory">/usr/share/hwdata</filename>)
       crontab to automatically update the <filename>usb.ids</filename> file
       periodically.

introduction/welcome/changelog.xml

@@ -74 +74 @@
           <para>[fernando] - Update to emacs-24.4.  Fixes
           <ulink url="&blfs-ticket-root;5712">#5712</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Finish update to usbutils-008.  Fixes
+          <ulink url="&blfs-ticket-root;5719">#5719</ulink>.</para>
         </listitem>
       </itemizedlist>

packages.ent

@@ -238 +238 @@
 <!ENTITY unzip-version                "6.0">
 <!ENTITY upower-version               "0.9.23">
-<!ENTITY usbutils-version             "007">
+<!ENTITY usbutils-version             "008">
 <!ENTITY which-version                "2.20">
 <!ENTITY zip-version                  "3.0">