Remove obsolete bits that we no longer need with module trees.

3 files changed, 2 insertions, 160 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 24d1a81fd..78acd770a 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -29,7 +29,7 @@ LOADLIBES =  -lpopt
 CFLAGS += -I.. -I$(LOADERDIR) -fno-strict-aliasing
 RPMCFLAGS = $(CFLAGS) -I/usr/include/rpm
 
-UTILS = modlist moddeps snarffont mapshdr readmap
+UTILS = modlist snarffont mapshdr readmap
 ifeq (s390, $(ARCH))
 UTILS += geninitrdsz
 endif
@@ -58,10 +58,6 @@ moduledeps.o: $(LOADERDIR)/moduledeps.c
 	cp $(LOADERDIR)/moduledeps.c ./
 	$(CC) $(CFLAGS) -c moduledeps.c
 
-moddeps: moddeps.o moduledeps.o
-	$(CC) $(LDFLAGS) -o moddeps moddeps.o moduledeps.o \
-            $(LOADLIBES) -lresolv -lpopt -lbz2
-
 md5.o: md5.c md5.h
 	gcc -c -O -g md5.c -D_FORTIFY_SOURCE=2
 
@@ -77,10 +73,7 @@ install: all
 	mkdir -p $(DESTDIR)/usr/bin
 	mkdir -p $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 genmodinfo $(DESTDIR)/$(RUNTIMEDIR)
-	install -m755 trimmodalias $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 trimpciids $(DESTDIR)/$(RUNTIMEDIR)
-	install -m755 moddeps $(DESTDIR)/$(RUNTIMEDIR)
-	install -m755 filtermoddeps $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 modlist $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 readmap $(DESTDIR)/$(RUNTIMEDIR)
 	install -m755 mapshdr $(DESTDIR)/$(RUNTIMEDIR)
@@ -89,7 +82,7 @@ install: all
 	fi
 
 clean:	
-	rm -f modlist moddeps snarffont mapshdr readmap geninitrdsz \
+	rm -f modlist snarffont mapshdr readmap geninitrdsz \
 	moduledeps.c moduleinfo.c .depend *.o
 
 depend:
diff --git a/utils/moddeps.c b/utils/moddeps.c
deleted file mode 100644
index eec80add0..000000000
--- a/utils/moddeps.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * moddeps.c
- *
- * Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <popt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/utsname.h>
-
-#include "../isys/isys.h"
-#include "modules.h"
-
-void setFloppyDevice(int flags) {
-}
-
-char *translateString(char *str) {
-	return NULL;
-}
-
-int extractModules(int location, char * modName) {
-    return 0;
-}
-
-void scsiWindow(const char * foo) {
-}
-
-void startNewt(int flags) {
-}
-
-void newtPopWindow(void) {
-}
-
-void newtWinChoice(void) {
-}
-
-void newtWinMessage(void) {
-}
-
-void eject(void) {
-}
-
-void winStatus(void) {
-}
-
-int main(int argc, char ** argv) {
-    poptContext optCon;
-    char * modDepsFile = NULL;
-    char * mod;
-    int rc;
-    char ** list, ** l;
-    struct utsname ut;
-    moduleDeps ml;
-    struct poptOption optionTable[] = {
-	    { "moddeps", 'm', POPT_ARG_STRING, &modDepsFile, 0 },
-	    POPT_AUTOHELP
-	    { 0, 0, 0, 0, 0 }
-    };
-
-    optCon = poptGetContext(NULL, argc, (const char **) argv, optionTable, 0);
-
-    if ((rc = poptGetNextOpt(optCon)) < -1) {
-	fprintf(stderr, "bad option %s: %s\n",
-		       poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
-		       poptStrerror(rc));
-	exit(1);
-    }
-
-    if (!modDepsFile) {
-        modDepsFile = malloc(100);
-	uname(&ut);
-	sprintf(modDepsFile, "/lib/modules/%s/modules.dep",
-		ut.release);
-    }
-
-    ml = mlNewDeps();
-    if (mlLoadDeps(&ml, modDepsFile)) {
-        fprintf(stderr, "Failed to read %s\n", modDepsFile);
-	exit(1);
-    }
-
-    while ((mod = (char *) poptGetArg(optCon))) {
-        list = mlGetDeps(ml, mod);
-	if (list) {
-	    for (l = list; *l; l++)
-	        printf("%s%s", l == list ? "" : " ", *l);
-	    printf("\n");
-	}
-    }
-
-    return 0;
-}
-
-void logMessage(const char * s, ...) {
-}
diff --git a/utils/trimmodalias b/utils/trimmodalias
deleted file mode 100755
index 6a055fd74..000000000
--- a/utils/trimmodalias
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-#
-# trimmodalias
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import os
-import sys
-import string
-
-modules = []
-
-args = sys.argv[1:]
-
-for arg in args:
-    arg = os.path.basename(arg)
-    arg = arg.replace('.ko','')
-    modules.append(arg)
-
-f = sys.stdin.readline()
-
-while f:
-    f = f.strip()
-    for mod in modules:
-	if f.endswith(' %s' % (mod,)):
-	    print f
-    f = sys.stdin.readline()