Changeset fab693d for BOOK/final-system

Timestamp:

Sep 3, 2007, 1:11:35 AM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

c13bac4

Parents:

8731fd5

Message:

Updated to udev 115.

Location:

BOOK/final-system

Files:

• common/udev.xml (modified) (5 diffs)
• multilib/udev-64bit.xml (modified) (2 diffs)

BOOK/final-system/common/udev.xml

@@ -28 +28 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make EXTRAS="extras/floppy extras/cdrom_id extras/firmware \
-    extras/scsi_id extras/volume_id extras/ata_id extras/usb_id \
-    extras/edd_id extras/collect extras/path_id"</userinput></screen>
+<screen os="b"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect
+    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
+    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
 
     <variablelist os="c">
@@ -36 +36 @@
 
       <varlistentry>
-      <term><parameter>EXTRAS="extras/floppy extras/cdrom_id extras/firmware
-      extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id
-      extras/collect extras/path_id"</parameter></term>
+      <term><parameter>EXTRAS="extras/ata_id extras/cdrom_id extras/collect
+      extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
+      extras/scsi_id extras/usb_id extras/volume_id"</parameter></term>
         <listitem>
           <para>This builds the helper applications that are used with
@@ -48 +48 @@
 
     <para os="d">If you want to run the testsuite, you need to change
-    a hardcoded reference to the <command>test</command>
-    program:</para>
+    a hardcoded reference to the <command>test</command> program:</para>
 
     <screen os="e"><userinput>sed -i 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
@@ -58 +57 @@
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make DESTDIR=/ \
-    EXTRAS="extras/floppy extras/cdrom_id extras/firmware \
-    extras/scsi_id extras/volume_id extras/ata_id extras/usb_id \
-    extras/edd_id extras/collect extras/path_id" install</userinput></screen>
+<screen os="h"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect
+    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
+    extras/scsi_id extras/usb_id extras/volume_id" DESTDIR=/ udevdir=/dev" install</userinput></screen>
 
     <variablelist os="i">
@@ -77 +75 @@
     </variablelist>
 
-    <para os="l">Install a necessary helper script:</para>
-
-<screen os="m"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
+    <para os="j">Install documentation:</para>
+
+<screen os="k"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
     /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
-    <para os="n">Create a directory for storing firmware that can be
+    <para os="l">Create a directory for storing firmware that can be
     loaded by <command>udev</command>:</para>
 
-<screen os="o"><userinput>install -dv /lib/firmware</userinput></screen>
-
-  <para os="p">Finally, remove the rules installed by Udev as we will be
-  installing custom Udev rules later:</para>
-
-<screen os="q"><userinput>rm -v /etc/udev/rules.d/*</userinput></screen>
+<screen os="m"><userinput>install -dv /lib/firmware</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/udev-64bit.xml

@@ -32 +32 @@
 
 <screen os="b"><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
-    EXTRAS="extras/cdrom_id extras/floppy extras/firmware extras/scsi_id \
-            extras/volume_id extras/ata_id extras/usb_id extras/edd_id \
-            extras/dasd_id extras/path_id"</userinput></screen>
+    EXTRAS="extras/ata_id extras/cdrom_id extras/collect
+    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
+    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -66 +66 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen os="o"><userinput>install -dv /lib64/firmware</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
+<screen os="m"><userinput>install -dv /lib64/firmware</userinput></screen>
 
   </sect2>