diff --git a/CONFIG.i386 b/CONFIG.i386 index 5b3a061..a6071c6 100644 --- a/CONFIG.i386 +++ b/CONFIG.i386 @@ -7,6 +7,12 @@ # CONFIG.xxx file to start with. ARCH=i386 +# iBCS is a loadable kernel module. It MUST be built against the +# source tree of the kernel you are running (or intend to load +# it in). More specifically it must be built against the include +# and config files belonging to the relevant kernel. +KERNEL=/usr/src/linux + # If you intend to run on a multiprocessor SMP system you will need # this enabled. You need to set this correctly. An SMP iBCS module # will not load against a non-SMP kernel (the symbol apic_reg is diff --git a/CONFIG.sparc b/CONFIG.sparc index a3f0298..4466cc2 100644 --- a/CONFIG.sparc +++ b/CONFIG.sparc @@ -7,6 +7,12 @@ # CONFIG.xxx file to start with. ARCH=sparc +# iBCS is a loadable kernel module. It MUST be built against the +# source tree of the kernel you are running (or intend to load +# it in). More specifically it must be built against the include +# and config files belonging to the relevant kernel. +KERNEL=/usr/src/linux + # If you want to use versioned symbol names in an attempt to allow the # iBCS module to load against other, compatible kernel versions enable # this. Be warned that I have observed that two different builds of diff --git a/ChangeLog b/ChangeLog index 4ce4cad..20e59ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Thu Oct 15 21:39:16 BST 1998 + * Added the location of the kernel source as an option + in the CONFIG. Hopefully this will make it a little + more obvious that iBCS is *dependant* on the kernel. + -- Mike + * Set SO_BSDCOMPAT on sockets. SYSV has BSD handling of ICMP errors on UDP sockets rather than RFC conformance. I think... diff --git a/iBCSemul/Makefile b/iBCSemul/Makefile index a27a2e1..a408fbe 100644 --- a/iBCSemul/Makefile +++ b/iBCSemul/Makefile @@ -1,7 +1,7 @@ # # Makefile for the iBCS emulator files # -# $Id: Makefile,v 1.62 1998/06/29 21:49:51 jaggy Exp $ +# $Id: Makefile,v 1.63 1998/10/15 20:48:37 jaggy Exp $ # $Source: /nfs4/sophia/home/mjagdis/src/ibcs.cvs/ibcs/iBCSemul/Makefile,v $ # @@ -117,7 +117,7 @@ LDMODFLAGS=-m elf_i386 endif ifeq ($(USE_VERSIONS),yes) -MODOPTS := -DMODVERSIONS -include /usr/include/linux/modversions.h +MODOPTS := -DMODVERSIONS -include $(KERNEL)/include/linux/modversions.h endif ifeq ($(SMP),yes) @@ -125,7 +125,7 @@ SMPOPTS := -D__SMP__=1 endif CFLAGS = -D__KERNEL__=1 -DMODULE -D__NO_VERSION__ \ - -I../include -I/usr/src/linux/include \ + -I../include -I$(KERNEL)/include \ -Wall -Wstrict-prototypes \ -O2 -fomit-frame-pointer $(ARCH_FLAGS) \ -DSOCKSYS_MAJOR=$(SOCKSYS_MAJOR) $(EMUOPTS) $(MODOPTS) $(SMPOPTS)