The last few ac patches have, when patched to a clone of
bk://linux.bkbits.net/linux-2.4 limited to the appropriate cset, had
rejects from drivers/scsi/sim710_d.h. patch(1) indicates a previously
applied patch.
arch/i386/kernel/time.c failed to compile. Based on the error, the
required patch is:
--- linux-2.4.20-pre4-ac1/arch/i386/kernel/Makefile Sun Aug 25 19:17:57 2002
+++ linux-2.4.20-pre4-ac1+/arch/i386/kernel/Makefile Mon Aug 26 00:34:43 2002
@@ -14,10 +14,10 @@
O_TARGET := kernel.o
-export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o
+export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
- ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
+ ptrace.o i8259.o ioport.o ldt.o setup.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o
-JimC
On Mon, Aug 26, 2002 at 12:36:05AM -0400, James H. Cloos Jr. wrote:
> The last few ac patches have, when patched to a clone of
> bk://linux.bkbits.net/linux-2.4 limited to the appropriate cset, had
> rejects from drivers/scsi/sim710_d.h. patch(1) indicates a previously
> applied patch.
>
> arch/i386/kernel/time.c failed to compile. Based on the error, the
> required patch is:
You still want time.o to be listed in obj-y for it to be built.
--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html
>>>>> "Russell" == Russell King <[email protected]> writes:
>> arch/i386/kernel/time.c failed to compile. Based on the error, the
>> required patch is:
Russell> You still want time.o to be listed in obj-y for it to be
Russell> built.
Yup. So I discovered after posting. [SIGH]
I should have looked at other Makefiles to confirm how the building
process works these days....
So the proper patch would presumably be:
--- linux-2.4.20-pre4-ac1/arch/i386/kernel/Makefile Sun Aug 25 19:17:57 2002
+++ linux-2.4.20-pre4-ac1+/arch/i386/kernel/Makefile Mon Aug 26 00:34:43 2002
@@ -14,10 +14,10 @@
O_TARGET := kernel.o
-export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o
+export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
- ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
+ ptrace.o i8259.o ioport.o ldt.o setup.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o
--- linux-2.4.20-pre4-ac1/arch/i386/kernel/Makefile Sun Aug 25 19:17:57 2002
+++ linux-2.4.20-pre4-ac1+/arch/i386/kernel/Makefile Mon Aug 26 00:34:43 2002
@@ -14,10 +14,10 @@
O_TARGET := kernel.o
-export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o
+export-objs := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o