Quoth Ben Duncan:
> Ok, I am removing what little hair I have left on my head.
>
> I am trying to patch the current kernel of 2.4.21-rc3 with the
> linux-abi (COFF / Sco emulation).
>
> Anyway,. have had to manually edit to get some of the stuff working.
>
> Now on some of the lines I am getting:
>
> patch ***** malformed patch at line xxxxxx: <some stuff>
>
> Exactly what the heck is that telling me?
Precisely what it says, that the patch is malformed at the
given line. Try posting a couple of lines of the output.
> And exactly WHAT is the stuff in the patch that is
>
> @@ -#,# +#,# @@
>
> doing or telling me as well ?
"@@ ... @@" characterizes a "hunk" or set of differences between the
files compared. "-M,N +O,P" says the N-sized context starting at line M
in the first file maps to the P-sized context starting at line O in the
second file, after the change "described" in the following lines is
applied to the first file. Consider the following:
$ diff -u config.orig config
@@ -65,7 +65,6 @@
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_SSE2=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_SMP=y
# CONFIG_PREEMPT is not set
This says that the that read "CONFIG_X86_SSE2=y" was deleted (hence the
"-") from the first file (config.orig), which looked like this:
65 CONFIG_X86_GOOD_APIC=y
66 CONFIG_X86_INTEL_USERCOPY=y
67 CONFIG_X86_USE_PPRO_CHECKSUM=y
68 CONFIG_X86_SSE2=y
69 # CONFIG_HUGETLB_PAGE is not set
70 CONFIG_SMP=y
71 # CONFIG_PREEMPT is not set
The second file (config) looked like this after the deleted line:
65 CONFIG_X86_GOOD_APIC=y
66 CONFIG_X86_INTEL_USERCOPY=y
67 CONFIG_X86_USE_PPRO_CHECKSUM=y
68 # CONFIG_HUGETLB_PAGE is not set
69 CONFIG_SMP=y
70 # CONFIG_PREEMPT is not set
Understand?
Kurt
--
Croll's Query:
If tin whistles are made of tin, what are foghorns made of?
_______________________________________________
Linux-users mailing list
[EMAIL PROTECTED]
Unsubscribe/Suspend/Etc -> http://www.linux-sxs.org/mailman/listinfo/linux-users
