Changeset 2f551f6

Timestamp:

Feb 21, 2006, 2:19:24 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

665552c

Parents:

ede92d9

Message:

r1120@server (orig r1118): chris | 2006-01-31 19:29:01 -0800
Added a sed command to udev instructions to account for the new 'test' program location

Files:

• boot/common/udev.xml (modified) (1 diff)
• boot/multilib/udev.xml (modified) (2 diffs)
• final-system/common/udev.xml (modified) (2 diffs)
• final-system/multilib/udev.xml (modified) (1 diff)

boot/common/udev.xml

@@ -36 +36 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${LFS} EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="i"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
+<screen os="k"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
   </sect2>

boot/multilib/udev.xml

@@ -36 +36 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -48 +44 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>

final-system/common/udev.xml

@@ -52 +52 @@
     </variablelist>
 
-    <para os="d">To test the results, issue:
+    <para os="d">If you want to run the testsuite, you need to change
+    a hardcoded reference to the <command>test</command>
+    program:</para>
+
+    <para os="e"><userinput>sed -i 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></para>
+
+    <para os="f">To test the results, issue:
     <userinput>make test</userinput>.</para>
 
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make DESTDIR=/ EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
-
-    <variablelist os="g">
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make DESTDIR=/ EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
+
+    <variablelist os="i">
       <title>The meaning of the make parameter:</title>
 
@@ -73 +79 @@
     </variablelist>
 
-    <para os="h">Udev's configuration is far from ideal by default, so install
+    <para os="j">Udev's configuration is far from ideal by default, so install
     the configuration files here:</para>
 
-<screen os="i"><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
-
-    <para os="j">Install the documentation that explains how to create
+<screen os="k"><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
+
+    <para os="l">Install the documentation that explains how to create
     Udev rules:</para>
 
-<screen os="k"><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
-
-    <para os="l">Run the <command>udevstart</command> program to create our full
+<screen os="m"><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
+
+    <para os="n">Run the <command>udevstart</command> program to create our full
     complement of device nodes.</para>
 
-<screen os="m"><userinput>/sbin/udevstart</userinput></screen>
+<screen os="o"><userinput>/sbin/udevstart</userinput></screen>
 
   </sect2>

final-system/multilib/udev.xml

@@ -72 +72 @@
     href="../common/udev.xml"
     xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
   </sect2>