-----BEGIN PGP SIGNED MESSAGE----- Hash: RIPEMD160 Bruce Dubbs wrote: > Bruce Dubbs wrote: >> I tried to patch udev116 with this and it didn't work. I did a >> cut/paste of the patch to a file, but only the first segment >> applied. The other three rejected. >> >> Is there something different about this patch format? I can >> generate the patch without too much problem, but I wonder why the >> cut/paste doesn't work. > > Never mind. In the git generated file are constructs like: > > @@ -224,8 +222,6 @@ static int usb_id(const char *devpath) > > It should just be: > > @@ -224,8 +222,6 @@ > > The annotation with the function name on the line seems to confuse > patch.
That's odd; I was generating patches that had that field in them a few days ago (via "diff -Npru"), and patch (2.5.9) seemed to handle them fine. But I just tried this one (again, patch-2.5.9), and you're right, it chokes. Maybe if you add -p and -u to the diff options and remove - --git, and kill the "index" line? You might also try this URL: http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff_plain;h=963033472f8d2aab0bf77147b916de8f3b0b5450 since the HTML generator may have hosed up something? Or just kill the function names; that's probably the simplest. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHJHjOS5vET1Wea5wRAzVPAJoCr9FIkoM7+j4mQ+kC3V30iFrIJwCgwVl2 ap9p+W/e9xc2ID+aE7rYXJs= =y8nK -----END PGP SIGNATURE----- -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
