Fix loading of the SMBFS kernel module. The KMODDEPS line in the SMBFS
authorHiten Pandya <hmp@dragonflybsd.org>
Tue, 16 Mar 2004 07:45:59 +0000 (07:45 +0000)
committerHiten Pandya <hmp@dragonflybsd.org>
Tue, 16 Mar 2004 07:45:59 +0000 (07:45 +0000)
Makefile generated incorrect (read fake) symbols; the build system was
pretty satisified but kldload was not and returned ENOEXEC.

Instead, add a Makefile for libiconv as it is supposed to be, because
SMBFS requires it as a module dependency.

Note, the SMBFS module needs to be recompiled for it to work, and the
libiconv KLD needs to be built using the newly added Makefile.  Also
rebuild 'libmchain'.

sys/libiconv/Makefile [new file with mode: 0644]
sys/libkern/Makefile [new file with mode: 0644]
sys/vfs/smbfs/Makefile

diff --git a/sys/libiconv/Makefile b/sys/libiconv/Makefile
new file mode 100644 (file)
index 0000000..f241903
--- /dev/null
@@ -0,0 +1,22 @@
+# $FreeBSD: src/sys/modules/libiconv/Makefile,v 1.4 2003/09/26 20:26:24 fjoe Exp $
+# $DragonFly: src/sys/libiconv/Makefile,v 1.1 2004/03/16 07:45:59 hmp Exp $
+
+.PATH: ${.CURDIR}/../libkern ${.CURDIR}/../sys
+
+KMOD=  libiconv
+SRCS=  iconv.c iconv_xlat.c
+SRCS+= iconv.h 
+SRCS+= iconv_converter_if.c iconv_converter_if.h
+MFILES=        libkern/iconv_converter_if.m
+
+EXPORT_SYMS=   iconv_open      \
+               iconv_close     \
+               iconv_conv      \
+               iconv_conv_case \
+               iconv_convchr   \
+               iconv_convchr_case      \
+               iconv_convstr   \
+               iconv_convmem   \
+               iconv_vfs_refcount
+
+.include <bsd.kmod.mk>
diff --git a/sys/libkern/Makefile b/sys/libkern/Makefile
new file mode 100644 (file)
index 0000000..dc9cdab
--- /dev/null
@@ -0,0 +1,22 @@
+# $FreeBSD: src/sys/modules/libiconv/Makefile,v 1.4 2003/09/26 20:26:24 fjoe Exp $
+# $DragonFly: src/sys/libkern/Attic/Makefile,v 1.1 2004/03/16 07:45:59 hmp Exp $
+
+.PATH: ${.CURDIR}/../libkern ${.CURDIR}/../sys
+
+KMOD=  libiconv
+SRCS=  iconv.c iconv_xlat.c
+SRCS+= iconv.h 
+SRCS+= iconv_converter_if.c iconv_converter_if.h
+MFILES=        libkern/iconv_converter_if.m
+
+EXPORT_SYMS=   iconv_open      \
+               iconv_close     \
+               iconv_conv      \
+               iconv_conv_case \
+               iconv_convchr   \
+               iconv_convchr_case      \
+               iconv_convstr   \
+               iconv_convmem   \
+               iconv_vfs_refcount
+
+.include <bsd.kmod.mk>
index 5b8fb64..8007963 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.1.2.4 2002/03/26 10:12:29 ume Exp $
-# $DragonFly: src/sys/vfs/smbfs/Makefile,v 1.3 2003/08/15 07:26:15 dillon Exp $
+# $DragonFly: src/sys/vfs/smbfs/Makefile,v 1.4 2004/03/16 07:45:59 hmp Exp $
 
 .PATH: ${.CURDIR}/../../crypto/des \
        ${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \
@@ -9,7 +9,6 @@
        ${.CURDIR}/../../netproto/smb
 
 KMOD=  smbfs
-KMODDEPS=      libiconv libmchain
 
 SRCS=  vnode_if.h \
        opt_inet.h opt_ipx.h \