Do a pass over the broken LKM's and update them to use the "new"

convention of having their entry point named "<modname>_mod"".
Symorder is enforcing this when the current bsd.kmod.mk is installed.

I've not tested all these, but at least they all compile now.

Reattach them to the makefile.

Note that the change that I made to symorder needs to be compiled and
installed before any LKM's will work - the last version was corrupting
the relocation tables.  A "make world" will to this, but if you
manually run a make on the lkm's you'll need to take care of it by
hand.

4 files changed, 13 insertions, 8 deletions

diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index 6069595..1d24244 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -10,6 +10,7 @@ SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 NOMAN=
 CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2
 CLEANFILES+= vnode_if.h vnode_if.c
+EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/sys/modules/ibcs2/ibcs2 b/sys/modules/ibcs2/ibcs2
index 48a4f7a..21f591e 100755
--- a/sys/modules/ibcs2/ibcs2
+++ b/sys/modules/ibcs2/ibcs2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: ibcs2,v 1.2 1994/10/16 20:39:16 sos Exp $
+# $Id: ibcs2,v 1.3 1995/10/10 08:38:11 swallace Exp $
 if [ $# -le 1 ]; then
 	LOADERS="coff" # elf
 fi
@@ -10,9 +10,11 @@ kernelfile=`sysctl -n kern.bootfile`
 kernelfile=`basename $kernelfile`
 newkernelfile="/tmp/${kernelfile}+ibcs2"
 
-modload -e ibcs2_init -o $newkernelfile -q /lkm/ibcs2_mod.o
+modload -e ibcs2_mod -o $newkernelfile -q /lkm/ibcs2_mod.o
+
 for loader in $LOADERS; do
-	modload -e${loader}_init -o/tmp/ibcs2_${loader}.o -qu \
+	modload -e ibcs2_${loader}_mod -o/tmp/ibcs2_${loader} -q -u \
 		-A${newkernelfile} /lkm/ibcs2_${loader}_mod.o
 done
+rm ${newkernelfile}
 set +e
diff --git a/sys/modules/ibcs2/ibcs2.c b/sys/modules/ibcs2/ibcs2.c
index 005e10f..b39f390 100644
--- a/sys/modules/ibcs2/ibcs2.c
+++ b/sys/modules/ibcs2/ibcs2.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2.c,v 1.3 1995/05/30 06:06:06 rgrimes Exp $
+ *	$Id: ibcs2.c,v 1.4 1995/10/10 08:20:28 swallace Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@ ibcs2_unload(struct lkm_table *lkmtp, int cmd)
 }
 
 int
-ibcs2_init(struct lkm_table *lkmtp, int cmd, int ver)
+ibcs2_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, ibcs2_load, ibcs2_unload, nosys);
 }
diff --git a/sys/modules/ibcs2/ibcs2.sh b/sys/modules/ibcs2/ibcs2.sh
index 48a4f7a..21f591e 100644
--- a/sys/modules/ibcs2/ibcs2.sh
+++ b/sys/modules/ibcs2/ibcs2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: ibcs2,v 1.2 1994/10/16 20:39:16 sos Exp $
+# $Id: ibcs2,v 1.3 1995/10/10 08:38:11 swallace Exp $
 if [ $# -le 1 ]; then
 	LOADERS="coff" # elf
 fi
@@ -10,9 +10,11 @@ kernelfile=`sysctl -n kern.bootfile`
 kernelfile=`basename $kernelfile`
 newkernelfile="/tmp/${kernelfile}+ibcs2"
 
-modload -e ibcs2_init -o $newkernelfile -q /lkm/ibcs2_mod.o
+modload -e ibcs2_mod -o $newkernelfile -q /lkm/ibcs2_mod.o
+
 for loader in $LOADERS; do
-	modload -e${loader}_init -o/tmp/ibcs2_${loader}.o -qu \
+	modload -e ibcs2_${loader}_mod -o/tmp/ibcs2_${loader} -q -u \
 		-A${newkernelfile} /lkm/ibcs2_${loader}_mod.o
 done
+rm ${newkernelfile}
 set +e