--- mdadm-2.5/Makefile.orig 2006-05-29 14:01:16 +0400 +++ mdadm-2.5/Makefile 2006-05-29 14:05:21 +0400 @@ -32,7 +32,7 @@ TCC = tcc UCLIBC_GCC = $(shell for nm in i386-uclibc-linux-gcc i386-uclibc-gcc; do which $$nm > /dev/null && { echo $$nm ; exit; } ; done; echo false No uclibc found ) DIET_GCC = diet gcc -LDLIBS=-lssl +LDLIBS= KLIBC=/home/src/klibc/klibc-0.77 @@ -67,12 +67,12 @@ OBJS = mdadm.o config.o mdstat.o ReadMe.o util.o Manage.o Assemble.o Build.o \ Create.o Detail.o Examine.o Grow.o Monitor.o dlink.o Kill.o Query.o \ - mdopen.o super0.o super1.o bitmap.o restripe.o sysfs.o + mdopen.o super0.o super1.o bitmap.o restripe.o sysfs.o SHA1.o sha1.o SRCS = mdadm.c config.c mdstat.c ReadMe.c util.c Manage.c Assemble.c Build.c \ Create.c Detail.c Examine.c Grow.c Monitor.c dlink.c Kill.c Query.c \ - mdopen.c super0.c super1.c bitmap.c restripe.c sysfs.c + mdopen.c super0.c super1.c bitmap.c restripe.c sysfs.c SHA1.c sha1.c -ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c +ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c SHA1.c sha1.c ASSEMBLE_FLAGS:= -DMDASSEMBLE ifdef MDASSEMBLE_AUTO ASSEMBLE_SRCS += mdopen.c mdstat.c @@ -89,7 +89,7 @@ mdadm.static : STATIC=-DSTATIC mdadm.static : rmconf $(OBJS) - $(CC) $(LDFLAGS) -DSTATIC -static -o mdadm.static $(OBJS) SHA1.o sha1.o + $(CC) $(LDFLAGS) -DSTATIC -static -o mdadm.static $(OBJS) rmconf: rm -f config.o @@ -97,7 +97,7 @@ $(TCC) -o mdadm.tcc $(SRCS) mdadm.uclibc : $(SRCS) mdadm.h - $(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) SHA1.c sha1.c + $(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) mdadm.klibc : $(SRCS) mdadm.h rm -f $(OBJS) @@ -108,15 +108,15 @@ mdassemble : $(ASSEMBLE_SRCS) mdadm.h rm -f $(OBJS) - $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) SHA1.c sha1.c + $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h rm -f $(OBJS) - $(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DSTATIC -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) SHA1.c sha1.c + $(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DSTATIC -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h rm -f $(OJS) - $(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DSTATIC -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) SHA1.c sha1.c + $(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DSTATIC -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) # This doesn't work mdassemble.klibc : $(ASSEMBLE_SRCS) mdadm.h --- mdadm-2.5/super0.c.orig 2006-05-26 08:18:55 +0400 +++ mdadm-2.5/super0.c 2006-05-29 14:09:43 +0400 @@ -28,11 +28,7 @@ */ #include "mdadm.h" -#ifndef UCLIBC -#include /* for SHA1 */ -#else extern unsigned char *SHA1(unsigned char *buf, int len, unsigned char *dest); -#endif /* * All handling for the 0.90.0 version superblock is in * this file.