Matthew Burgess wrote:
> steve crosby wrote:
>
>> The patch needs a proper LFS header applied and sending upstream
>> (hint, hint, nudge, nudge). Tested here on udev-067 without issue.
>
> Hmm, this is the second patch you've attached (and Randy sent a
> similarly affected one too) that fails to apply cleanly. Vim seems to
> think its got DOS CRLF characters on it. Is my MUA (Thunderbird)
> behaving badly here, or is the patch getting screwed up when you attach
> it? Perhaps you could try getting it attached 'inline' - I've heard
> that sometimes fixes similar problems other folks have reported.
I get the ^M chars in the file also (Mozilla Mail); all lines except the
last. Easy enough to fix in vi -b filename (:% s/\r//), but it should
be fixed at the source.
Just to test, I fixed the file and am attaching.
-- Bruce
diff -Naur udev-067.orig/test/udev-test.pl udev-067/test/udev-test.pl
--- udev-067.orig/test/udev-test.pl 2005-08-14 05:10:50.000000000 +1200
+++ udev-067/test/udev-test.pl 2005-08-15 17:40:43.497341376 +1200
@@ -28,6 +28,42 @@
my $udev_conf = "udev-test.conf";
my $udev_rules = "udev-test.rules";
+#
+# Calculate actual paths of external binaries
+#
+my %extern_bin = (
+ 'echo' => '/bin/echo',
+ 'false' => '/bin/false',
+ 'ln' => '/bin/ln',
+ 'ls' => '/bin/ls', # not used directly - replacement for tree if not found
+ 'rm' => '/bin/rm',
+ 'sed' => '/usr/bin/sed',
+ 'sh' => '/bin/sh',
+ 'test' => '/usr/bin/test',
+ 'tree' => '/usr/local/bin/tree'
+);
+my @SEARCH_PATH = split(/:/,$ENV{PATH});
+while (my ($key, $value) = each %extern_bin) {
+ my $FOUND_PATH = ""; # Only find *first* occurence
+ foreach my $path_element (@SEARCH_PATH) {
+ if (($FOUND_PATH eq "") && (-x $path_element.'/'.$key)) { $FOUND_PATH =
"$path_element"; }
+ }
+ if ($FOUND_PATH ne "") {
+ $extern_bin{$key}=$FOUND_PATH.'/'.$key
+ } else {
+ # "tree" is a special case - if not found, use ls -laR instead
+ if ($key eq "tree") {
+ # We want to use the same value as for ls, but unless we sort
+ # the hash, we can't say if ls has been checked yet. Just set
+ # a marker and do it last.
+ $extern_bin{$key}="NOT FOUND";
+ } else {
+ die "Unable to locate external binary $key in system PATH";
+ }
+ }
+}
+if ($extern_bin{'tree'} eq 'NOT FOUND') { $extern_bin{'tree'} =
$extern_bin{'ls'}.' -laR'; }
+
# uncomment following line to run udev with valgrind.
# Should make this a runtime option to the script someday...
#my $udev_bin = "valgrind --tool=memcheck --leak-check=yes ../udev";
@@ -200,7 +236,7 @@
devpath => "/class/tty/ttyUSB0",
exp_name => "aaa",
rules => <<EOF
-KERNEL=="ttyUSB0", PROGRAM=="/bin/echo -e \\101", RESULT=="A", NAME="aaa"
+KERNEL=="ttyUSB0", PROGRAM=="$extern_bin{'echo'} -e \\101", RESULT=="A",
NAME="aaa"
EOF
},
{
@@ -274,7 +310,7 @@
devpath => "/block/sda",
exp_name => "node12345678",
rules => <<EOF
-BUS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678 \\n TEST_key2=98765
\'", NAME="node\$env{TEST_KEY}"
+BUS=="scsi", IMPORT="$extern_bin{'echo'} -e \' TEST_KEY=12345678 \\n
TEST_key2=98765 \'", NAME="node\$env{TEST_KEY}"
KERNEL=="ttyUSB0", NAME="visor"
EOF
},
@@ -294,11 +330,11 @@
devpath => "/block/sda/sda3",
exp_name => "special-device-3" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="-special-*",
NAME="%c-1-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special--*",
NAME="%c-2-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device",
RESULT=="special-device-", NAME="%c-3-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-devic",
NAME="%c-4-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*",
NAME="%c-%n"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n special-device",
RESULT=="-special-*", NAME="%c-1-%n"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n special-device",
RESULT=="special--*", NAME="%c-2-%n"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n special-device",
RESULT=="special-device-", NAME="%c-3-%n"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n special-device",
RESULT=="special-devic", NAME="%c-4-%n"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n special-device",
RESULT=="special-*", NAME="%c-%n"
EOF
},
{
@@ -307,7 +343,7 @@
devpath => "/block/sda/sda3",
exp_name => "subsys_block" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo", RESULT=="block", NAME="subsys_block"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'}", RESULT=="block",
NAME="subsys_block"
EOF
},
{
@@ -316,7 +352,7 @@
devpath => "/block/sda/sda3",
exp_name => "newline_removed" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", NAME="newline_removed"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} test", RESULT=="test",
NAME="newline_removed"
EOF
},
{
@@ -325,7 +361,7 @@
devpath => "/block/sda/sda3",
exp_name => "test-0:0:0:0" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n test-%b", RESULT=="test-0:0*",
NAME="%c"
EOF
},
{
@@ -334,7 +370,7 @@
devpath => "/block/sda/sda3",
exp_name => "escape-3" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n escape-%%n", KERNEL=="sda3",
NAME="%c"
EOF
},
{
@@ -343,7 +379,7 @@
devpath => "/block/sda/sda3",
exp_name => "foo9" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9",
KERNEL=="sda3", NAME="%c{7}"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n foo3 foo4 foo5 foo6 foo7 foo8
foo9", KERNEL=="sda3", NAME="%c{7}"
EOF
},
{
@@ -352,7 +388,7 @@
devpath => "/block/sda/sda3",
exp_name => "bar9" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 |
sed s/foo9/bar9/'", KERNEL=="sda3", NAME="%c{7}"
+BUS=="scsi", PROGRAM=="$extern_bin{'sh'} -c 'echo foo3 foo4 foo5 foo6 foo7
foo8 foo9 | $extern_bin{'sed'} s/foo9/bar9/'", KERNEL=="sda3", NAME="%c{7}"
EOF
},
{
@@ -361,7 +397,7 @@
devpath => "/block/sda/sda3",
exp_name => "foo7" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4' 'foo5 foo6 foo7 foo8'",
KERNEL=="sda3", NAME="%c{5}"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n 'foo3 foo4' 'foo5 foo6
foo7 foo8'", KERNEL=="sda3", NAME="%c{5}"
EOF
},
{
@@ -370,7 +406,7 @@
devpath => "/block/sda/sda3",
exp_name => "my-foo9" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9",
KERNEL=="sda3", NAME="my-%c{7}"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n foo3 foo4 foo5 foo6 foo7 foo8
foo9", KERNEL=="sda3", NAME="my-%c{7}"
EOF
},
{
@@ -379,7 +415,7 @@
devpath => "/block/sda/sda3",
exp_name => "my-foo8" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9",
KERNEL=="sda3", NAME="my-%c{6}"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n foo3 foo4 foo5 foo6 foo7 foo8
foo9", KERNEL=="sda3", NAME="my-%c{6}"
EOF
},
{
@@ -433,7 +469,7 @@
devpath => "/class/tty/console",
exp_name => "TTY" ,
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n foo", RESULT=="foo", NAME="foo"
KERNEL=="console", NAME="TTY"
EOF
},
@@ -443,7 +479,7 @@
devpath => "/class/tty/console",
exp_name => "foo" ,
rules => <<EOF
-PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+PROGRAM=="$extern_bin{'echo'} -n foo", RESULT=="foo", NAME="foo"
KERNEL=="console", NAME="TTY"
EOF
},
@@ -473,9 +509,9 @@
devpath => "/block/sda",
exp_name => "scsi-0:0:0:0" ,
rules => <<EOF
-BUS=="usb", PROGRAM=="/bin/echo -n usb-%b", NAME="%c"
-BUS=="scsi", PROGRAM=="/bin/echo -n scsi-%b", NAME="%c"
-BUS=="foo", PROGRAM=="/bin/echo -n foo-%b", NAME="%c"
+BUS=="usb", PROGRAM=="$extern_bin{'echo'} -n usb-%b", NAME="%c"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n scsi-%b", NAME="%c"
+BUS=="foo", PROGRAM=="$extern_bin{'echo'} -n foo-%b", NAME="%c"
EOF
},
{
@@ -935,7 +971,7 @@
exp_name => "test",
exp_target => "ttyUSB0",
rules => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo test" NAME="ttyUSB%n",
SYMLINK+="%c"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="$extern_bin{'echo'} test" NAME="ttyUSB%n",
SYMLINK+="%c"
EOF
},
{
@@ -945,7 +981,7 @@
exp_name => "test",
exp_target => "ttyUSB0",
rules => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this"
NAME="ttyUSB%n", SYMLINK+="%c{2}"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="$extern_bin{'echo'} symlink test this"
NAME="ttyUSB%n", SYMLINK+="%c{2}"
EOF
},
{
@@ -955,7 +991,7 @@
exp_name => "this",
exp_target => "ttyUSB0",
rules => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this"
NAME="ttyUSB%n", SYMLINK+="%c{2+}"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="$extern_bin{'echo'} symlink test this"
NAME="ttyUSB%n", SYMLINK+="%c{2+}"
EOF
},
{
@@ -965,7 +1001,7 @@
exp_name => "test",
exp_target => "link",
rules => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo link test this"
SYMLINK+="%c{2+}"
+BUS=="scsi", KERNEL=="sda", PROGRAM=="$extern_bin{'echo'} link test this"
SYMLINK+="%c{2+}"
BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="symlink0"
EOF
},
@@ -1016,7 +1052,7 @@
exp_name => "link1",
exp_target => "node",
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2", RESULT=="node *",
NAME="%c{1}", SYMLINK+="%c{2} %c{3}"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n node link1 link2", RESULT=="node
*", NAME="%c{1}", SYMLINK+="%c{2} %c{3}"
EOF
},
{
@@ -1026,7 +1062,7 @@
exp_name => "link4",
exp_target => "node",
rules => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4",
RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
+BUS=="scsi", PROGRAM=="$extern_bin{'echo'} -n node link1 link2 link3 link4",
RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
EOF
},
{
@@ -1177,7 +1213,7 @@
devpath => "/block/sda",
exp_name => "node",
rules => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" NAME="node"
+BUS=="scsi", KERNEL=="sda", PROGRAM=="$extern_bin{'test'} -b %N" NAME="node"
EOF
},
{
@@ -1186,7 +1222,7 @@
devpath => "/block/sda",
exp_name => "sda",
rules => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/block/sda"
NAME="%k"
+BUS=="scsi", KERNEL=="sda", PROGRAM=="$extern_bin{'echo'} %p",
RESULT=="/block/sda" NAME="%k"
EOF
},
{
@@ -1256,7 +1292,7 @@
devpath => "/block/sda/sda1",
exp_name => "nonzero-program",
rules => <<EOF
-KERNEL=="sda1", PROGRAM!="/bin/false", NAME="nonzero-program"
+KERNEL=="sda1", PROGRAM!="$extern_bin{'false'}", NAME="nonzero-program"
BUS=="scsi", KERNEL=="sda1", NAME="wrong"
EOF
},
@@ -1299,7 +1335,7 @@
devpath => "/block/sda/sda1",
exp_name => "sane",
rules => <<EOF
-BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e name; (/sbin/badprogram)",
RESULT="name_ _/sbin/badprogram_", NAME="sane"
+BUS=="scsi", KERNEL=="sda1", PROGRAM=="$extern_bin{'echo'} -e name;
(/sbin/badprogram)", RESULT="name_ _/sbin/badprogram_", NAME="sane"
EOF
},
{
@@ -1354,7 +1390,7 @@
exp_rem_error => "yes",
option => "clean",
rules => <<EOF
-KERNEL=="sda", NAME="ok", RUN+="/bin/ln -s ok %r/testsymlink"
+KERNEL=="sda", NAME="ok", RUN+="$extern_bin{'ln'} -s ok %r/testsymlink"
KERNEL=="sda", NAME="not-ok"
EOF
},
@@ -1367,7 +1403,7 @@
exp_rem_error => "yes",
option => "clean",
rules => <<EOF
-KERNEL=="sda", NAME="ok", RUN+="/bin/sh -c 'ln -s `basename \$\$DEVNAME`
%r/testsymlink'"
+KERNEL=="sda", NAME="ok", RUN+="$extern_bin{'sh'} -c 'ln -s `basename
\$\$DEVNAME` %r/testsymlink'"
KERNEL=="sda", NAME="not-ok"
EOF
},
@@ -1378,8 +1414,8 @@
exp_name => "testsymlink2",
exp_target => "ok2",
rules => <<EOF
-KERNEL=="sda", NAME="ok2", RUN+="/bin/ln -s ok2 %r/testsymlink2"
-KERNEL=="sda", ACTION=="remove", RUN+="/bin/rm -f %r/testsymlink2"
+KERNEL=="sda", NAME="ok2", RUN+="$extern_bin{'ln'} -s ok2 %r/testsymlink2"
+KERNEL=="sda", ACTION=="remove", RUN+="$extern_bin{'rm'} -f %r/testsymlink2"
KERNEL=="sda", NAME="not-ok2"
EOF
},
@@ -1480,7 +1516,7 @@
exp_name => "parent",
option => "keep",
rules => <<EOF
-KERNEL=="sda", IMPORT="/bin/echo -e
\'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
+KERNEL=="sda", IMPORT="$extern_bin{'echo'} -e
\'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
KERNEL=="sda", NAME="parent"
EOF
},
@@ -1667,7 +1703,7 @@
print " as expected\n";
} else {
print "\n";
- system("tree $udev_root");
+ system("$extern_bin{'tree'} $udev_root");
print "\n";
$error++;
}
@@ -1686,7 +1722,7 @@
print " as expected\n";
} else {
print "\n";
- system("tree $udev_root");
+ system("$extern_bin{'tree'} $udev_root");
print "\n";
$error++;
}
@@ -1697,8 +1733,8 @@
print "\n";
if (defined($rules->{option}) && $rules->{option} eq "clean") {
- system("rm -rf $udev_db");
- system("rm -rf $udev_root");
+ system("$extern_bin{'rm'} -rf $udev_db");
+ system("$extern_bin{'rm'} -rf $udev_root");
mkdir($udev_root) || die "unable to create udev_root:
$udev_root\n";
}
@@ -1712,7 +1748,7 @@
}
# prepare
-system("rm -rf $udev_root");
+system("$extern_bin{'rm'} -rf $udev_root");
mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
# create config file
@@ -1747,8 +1783,8 @@
print "$error errors occured\n\n";
# cleanup
-system("rm -rf $udev_db");
-system("rm -rf $udev_root");
+system("$extern_bin{'rm'} -rf $udev_db");
+system("$extern_bin{'rm'} -rf $udev_root");
unlink($udev_rules);
unlink($udev_conf);--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
