diff options
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | Makefile.inc | 6 | ||||
-rw-r--r-- | isys/Makefile | 18 | ||||
-rw-r--r-- | isys/ethtool.c | 4 | ||||
-rw-r--r-- | isys/gzlib/Makefile | 13 | ||||
-rw-r--r-- | isys/nfsmount.h | 6 | ||||
-rw-r--r-- | isys/smp.c | 7 | ||||
-rw-r--r-- | isys/wireless.c | 4 | ||||
-rw-r--r-- | loader2/Makefile | 19 | ||||
-rw-r--r-- | loader2/md5.h | 4 |
10 files changed, 18 insertions, 75 deletions
@@ -1,5 +1,17 @@ 2006-06-26 Peter Jones <pjones@redhat.com> + * Makefile.inc: get rid of USEDIET + * isys/gzlib/Makefile: get rid of USEDIET and DIETLIB + * isys/Makefile: get rid of USEDIET and DOBJECTS + * loader2/Makefile: ditto + * isys/ethtool.c: get rid of DIET + * isys/nfsmount.h: ditto + * isys/smp.c: ditto + * isys/wireless.c: ditto + * loader2/md5.h: ditto + +2006-06-26 Peter Jones <pjones@redhat.com> + * loader2/modstubs.c (extractModule): don't leak memory * loader2/loader.c: set up mtrace and segfault handling very early, and put the segfault on tty8 so newt won't garble it. diff --git a/Makefile.inc b/Makefile.inc index 046026297..0675ed7d4 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -18,12 +18,6 @@ else LIBDIR = lib endif -# diet defines -USEDIET=0 -ifeq (nosucharch, $(ARCH)) -USEDIET=1 -endif - USESELINUX=1 ifeq ($(USESELINUX),1) diff --git a/isys/Makefile b/isys/Makefile index 21ef7eb66..04b833c72 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -12,20 +12,13 @@ LOADLIBES = -lresolv -lpci -lpopt -lext2fs -lz -lkudzu -lpci -ldevmapper LOADLIBES += $(SELINUXLIBES) PYMODULES = _isys.so SUBDIRS = gzlib -DIET = diet # glib LOADLIBES += $(shell pkg-config --libs glib-2.0) CFLAGS += $(shell pkg-config --cflags glib-2.0) -DOBJECTS = $(patsubst %.o,%.do,$(OBJECTS)) - GENERATED = nfs_mountversion.h -ifeq (1, $(USEDIET)) -DIETLIB=libisys-diet.a -endif - ifeq ($(ARCH),sparc) PYMODULES += _silo.so SOURCES += silo.c @@ -44,14 +37,11 @@ endif everything: $(TARGET) -all: subdirs $(PYMODULES) libisys.a $(DIETLIB) +all: subdirs $(PYMODULES) libisys.a %.lo: %.c $(CC) -c $(CFLAGS) -fPIC -o $@ $< -%.do: %.c - $(DIET) $(CC) -c $(CFLAGS) -DGZLIB=1 -DDIET=1 "-Du_char=unsigned char" -o $(SELINUXFLAGS) $@ $< - _isys.so: isys.lo $(SOBJECTS) gcc -shared -g -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES) @@ -60,13 +50,11 @@ _silo.so: silo.c libisys.a: libisys.a($(OBJECTS)) -libisys-diet.a: libisys-diet.a($(DOBJECTS)) - filtertest: filtertest.o libisys.a clean: - rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS) $(DOBJECTS) - rm -f $(DIETLIBS) $(OBJECTS) $(GENERATED) + rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS) + rm -f $(OBJECTS) $(GENERATED) rm -f .depend rm -f nl for d in $(SUBDIRS); do make -C $$d clean; done diff --git a/isys/ethtool.c b/isys/ethtool.c index bc4707c22..e1e68c7d0 100644 --- a/isys/ethtool.c +++ b/isys/ethtool.c @@ -24,10 +24,6 @@ #include <sys/types.h> #include <net/if.h> -#ifdef DIET -typedef void * caddr_t; -#endif - #include <linux/sockios.h> #include "net.h" diff --git a/isys/gzlib/Makefile b/isys/gzlib/Makefile index f1ffab849..c591ed9c0 100644 --- a/isys/gzlib/Makefile +++ b/isys/gzlib/Makefile @@ -4,20 +4,11 @@ CFLAGS += -I . -fPIC SOURCES = bits.c gzip.c inflate.c lzw.c trees.c unzip.c util.c zip.c binding.c \ deflate.c zip.c OBJS = $(patsubst %.c,%.o,$(SOURCES)) -DOBJS = $(patsubst %.o,%.do,$(OBJS)) -ifeq (1, $(USEDIET)) -DIETLIB=libgunzip-diet.a($(DOBJS)) -endif - -all: libgunzip.a($(OBJS)) $(DIETLIB) test +all: libgunzip.a($(OBJS)) test test: libgunzip.a test.c $(CC) $(CFLAGS) -o test test.c libgunzip.a clean: - rm -f libgunzip.a $(OBJS) $(DOBJS) libgunzip-diet.a - -%.do: %.c - diet $(CC) -c $(CFLAGS) -o $@ $< - + rm -f libgunzip.a $(OBJS) diff --git a/isys/nfsmount.h b/isys/nfsmount.h index 7688f91c7..55b5d8e7e 100644 --- a/isys/nfsmount.h +++ b/isys/nfsmount.h @@ -58,12 +58,6 @@ extern "C" { typedef char fhandle[FHSIZE]; -#ifdef DIET -typedef unsigned int u_int; -typedef unsigned long u_long; -typedef void * caddr_t; -#endif - typedef struct { u_int fhandle3_len; char *fhandle3_val; diff --git a/isys/smp.c b/isys/smp.c index 50ccda8eb..eced42c66 100644 --- a/isys/smp.c +++ b/isys/smp.c @@ -16,13 +16,6 @@ #include <stdint.h> #include <sys/types.h> -#ifdef DIET -typedef unsigned short u_short; -typedef unsigned long u_long; -typedef unsigned int u_int; -#endif - - #ifdef __alpha__ int alphaDetectSMP(void) { diff --git a/isys/wireless.c b/isys/wireless.c index b5dab1cd7..fd893c888 100644 --- a/isys/wireless.c +++ b/isys/wireless.c @@ -26,10 +26,6 @@ #include <sys/socket.h> #include <sys/types.h> -#ifdef DIET -typedef void * caddr_t; -#endif - #include <linux/wireless.h> static struct iwreq get_wreq(char * ifname) { diff --git a/loader2/Makefile b/loader2/Makefile index 03489786d..fe4466243 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -38,12 +38,7 @@ NETOBJS = net.o urls.o ftp.o telnet.o telnetd.o PCMCIAOBJS = pcmcia.o $(NETOBJS) SOURCES = $(subst .o,.c,$(OBJS)) loader.c -HWLIBS = -lkudzu_loader -ifeq (1, $(USEDIET)) -HWLIBS += -lpci_loader -else -HWLIBS += -lpci -endif +HWLIBS = -lkudzu_loader -lpci # NSS linker flags NSSFLAGS = -Wl,-rpath-link,/nss @@ -52,19 +47,7 @@ CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"' STATIC = -static REALCC=gcc -ifeq (1, $(USEDIET)) -CFLAGS += -DGZLIB=1 -DDIET=1 -DIET=diet -CC=$(DIET) $(REALCC) -ISYSLIB = ../isys/libisys-diet.a -GUNZIP = ../isys/gzlib/libgunzip-diet.a - -OBJS += dietstubs.o ctype.o -ISYSLIB += -lrpc -CTYPEDEP = ctype.c -else UNICODELIB = ../stubs/libunicode-lite.a -endif # linuxrc + shutdown on s390, init everywhere else ifneq (,$(filter s390 s390x,$(ARCH))) diff --git a/loader2/md5.h b/loader2/md5.h index e376124ec..fb6bf20a9 100644 --- a/loader2/md5.h +++ b/loader2/md5.h @@ -3,11 +3,7 @@ #include <sys/types.h> -#ifdef DIET -typedef uint32_t uint32; -#else typedef u_int32_t uint32; -#endif struct MD5Context { uint32 buf[4]; |