we don't need modutils in isys

2 files changed, 12 insertions, 6 deletions

diff --git a/isys/Makefile b/isys/Makefile
index 57fe503fe..e3672a55d 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -1,8 +1,8 @@
 CFLAGS = -I/usr/include/python1.5 -g
 OBJECTS = isys.o nfsmount.o dns.o mount_clnt.o mount_xdr.o imount.o \
-          smp.o moduleinfo.o devnodes.o otherinsmod.o cpio.o probe.o
-STATICLIBS = pci/libpciprobe.a modutils/insmod/libmodutils.a \
-	     modutils/obj/libobj.a modutils/util/libutil.a
+          smp.o moduleinfo.o devnodes.o cpio.o probe.o
+STATICOBJS = otherinsmod.o
+STATICLIBS = pci/libpciprobe.a
 LOADLIBES = -lrpm -lresolv -lz -lpci
 SUBDIRS = modutils pci
 PYTHONLIBDIR = $(DESTDIR)/usr/lib/python1.5/site-packages
@@ -12,7 +12,7 @@ all: subdirs _isys.so libisys.a
 _isys.so: $(OBJECTS) $(STATICLIBS)
 	gcc -shared -g -o $@ $(OBJECTS) $(STATICLIBS) $(LOADLIBES)
 
-libisys.a: libisys.a($(OBJECTS))
+libisys.a: libisys.a($(OBJECTS) $(STATICOBJS))
 
 clean:
 	rm -f *.o $(TARGET) $(OBJECTS)
diff --git a/isys/isys.c b/isys/isys.c
index ea4cce7b7..ec43df705 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -16,10 +16,10 @@
 moduleInfoSet modInfoList;
 
 static PyObject * doFindModInfo(PyObject * s, PyObject * args);
-static PyObject * doInsmod(PyObject * s, PyObject * args);
+/*static PyObject * doInsmod(PyObject * s, PyObject * args);
+static PyObject * doRmmod(PyObject * s, PyObject * args);*/
 static PyObject * doMount(PyObject * s, PyObject * args);
 static PyObject * doReadModInfo(PyObject * s, PyObject * args);
-static PyObject * doRmmod(PyObject * s, PyObject * args);
 static PyObject * doUMount(PyObject * s, PyObject * args);
 static PyObject * getModuleList(PyObject * s, PyObject * args);
 static PyObject * makeDevInode(PyObject * s, PyObject * args);
@@ -35,13 +35,17 @@ static PyObject * doSwapon(PyObject * s, PyObject * args);
 
 static PyMethodDef isysModuleMethods[] = {
     { "findmoduleinfo", (PyCFunction) doFindModInfo, METH_VARARGS, NULL },
+/*
     { "insmod", (PyCFunction) doInsmod, METH_VARARGS, NULL },
+*/
     { "mkdevinode", (PyCFunction) makeDevInode, METH_VARARGS, NULL },
     { "modulelist", (PyCFunction) getModuleList, METH_VARARGS, NULL },
     { "pciprobe", (PyCFunction) doPciProbe, METH_VARARGS, NULL },
     { "ProbedList", (PyCFunction) createProbedList, METH_VARARGS, NULL }, 
     { "readmoduleinfo", (PyCFunction) doReadModInfo, METH_VARARGS, NULL },
+/*
     { "rmmod", (PyCFunction) doRmmod, METH_VARARGS, NULL },
+*/
     { "mount", (PyCFunction) doMount, METH_VARARGS, NULL },
     { "smpavailable", (PyCFunction) smpAvailable, METH_VARARGS, NULL },
     { "umount", (PyCFunction) doUMount, METH_VARARGS, NULL },
@@ -194,6 +198,7 @@ static PyObject * makeDevInode(PyObject * s, PyObject * args) {
     return Py_None;
 }
 
+#if 0
 static PyObject * doRmmod(PyObject * s, PyObject * pyargs) {
     char * modName;
 
@@ -242,6 +247,7 @@ static PyObject * doInsmod(PyObject * s, PyObject * pyargs) {
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 static PyObject * doFindModInfo(PyObject * s, PyObject * args) {
     char * mod;