Hi folks, attached you can find a tiny patch for klibc-0.198 to get rid of the symbolic link pointing to the kernel sources, and to get rid of some obsolete rebuilds during incremental. Feel free to include it. Regards Harri -------------- next part -------------- diff -ur old/klibc-0.198/MCONFIG klibc-0.198/MCONFIG --- old/klibc-0.198/MCONFIG 2004-10-14 06:32:24.000000000 +0200 +++ klibc-0.198/MCONFIG 2005-02-06 14:46:27.465647751 +0100 @@ -7,8 +7,9 @@ OBJROOT = $(SRCROOT) # Kernel trees (source and obj) - can potentially be different -KRNLSRC = $(SRCROOT)/linux -KRNLOBJ = $(SRCROOT)/linux +# KRNLSRC = $(SRCROOT)/linux +KRNLSRC := /lib/modules/$(shell /bin/uname -r)/source +KRNLOBJ = $(KRNLSRC) ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) CROSS diff -ur old/klibc-0.198/ash/Makefile klibc-0.198/ash/Makefile --- old/klibc-0.198/ash/Makefile 2005-01-27 22:21:29.000000000 +0100 +++ klibc-0.198/ash/Makefile 2005-02-06 15:56:36.478233705 +0100 @@ -111,8 +111,7 @@ $(OBJ_NODES): nodes.h $(OBJ_SYNTAX): syntax.h -nodes.c nodes.h: mknodes.sh nodetypes nodes.c.pat nodes -nodes: +nodes.c nodes.h nodes: mknodes.sh nodetypes nodes.c.pat sh mknodes.sh nodetypes nodes.c.pat . signames.c: mksignames diff -ur old/klibc-0.198/utils/Makefile klibc-0.198/utils/Makefile --- old/klibc-0.198/utils/Makefile 2004-10-26 04:32:13.000000000 +0200 +++ klibc-0.198/utils/Makefile 2005-02-06 16:35:45.967773830 +0100 @@ -10,11 +10,14 @@ insmod uname STATICPROGS := $(patsubst %,static/%,$(PROGS)) SHAREDPROGS := $(patsubst %,shared/%,$(PROGS)) +OBJS := $(patsubst %,%.o,$(PROGS)) LIBOBJS = file_mode.o LIBUTILS = libutils.a all: $(STATICPROGS) $(SHAREDPROGS) +.SECONDARY: $(OBJS) + static/%: %.o $(CRT0) $(LIBS) $(LIBUTILS) mkdir -p static static.g $(LD) $(LDFLAGS) -o $@ $(CRT0) $< $(LIBUTILS) $(LIBS)
Harald Dunkel wrote:> Hi folks, > > attached you can find a tiny patch for klibc-0.198 > to get rid of the symbolic link pointing to the > kernel sources, and to get rid of some obsolete > rebuilds during incremental. > > Feel free to include it. >I really *don't* want to include it, since it not necessarily correctly assumes that you want to use the running kernel as the basis. I believe it's also wrong for the separated src/obj kernel trees. Note that you can override the default symlink with KRNLSRC= and KRNLOBJ=.> diff -ur old/klibc-0.198/ash/Makefile klibc-0.198/ash/Makefile > --- old/klibc-0.198/ash/Makefile 2005-01-27 22:21:29.000000000 +0100 > +++ klibc-0.198/ash/Makefile 2005-02-06 15:56:36.478233705 +0100 > @@ -111,8 +111,7 @@ > $(OBJ_NODES): nodes.h > $(OBJ_SYNTAX): syntax.h > > -nodes.c nodes.h: mknodes.sh nodetypes nodes.c.pat nodes > -nodes: > +nodes.c nodes.h nodes: mknodes.sh nodetypes nodes.c.pat > sh mknodes.sh nodetypes nodes.c.pat . > > signames.c: mksignames > diff -ur old/klibc-0.198/utils/Makefile klibc-0.198/utils/Makefile > --- old/klibc-0.198/utils/Makefile 2004-10-26 04:32:13.000000000 +0200 > +++ klibc-0.198/utils/Makefile 2005-02-06 16:35:45.967773830 +0100 > @@ -10,11 +10,14 @@ > insmod uname > STATICPROGS := $(patsubst %,static/%,$(PROGS)) > SHAREDPROGS := $(patsubst %,shared/%,$(PROGS)) > +OBJS := $(patsubst %,%.o,$(PROGS)) > LIBOBJS = file_mode.o > LIBUTILS = libutils.a > > all: $(STATICPROGS) $(SHAREDPROGS) > > +.SECONDARY: $(OBJS) > + > static/%: %.o $(CRT0) $(LIBS) $(LIBUTILS) > mkdir -p static static.g > $(LD) $(LDFLAGS) -o $@ $(CRT0) $< $(LIBUTILS) $(LIBS) >-hpa
On Sun, Feb 06, Harald Dunkel wrote:> diff -ur old/klibc-0.198/ash/Makefile klibc-0.198/ash/Makefile > --- old/klibc-0.198/ash/Makefile 2005-01-27 22:21:29.000000000 +0100 > +++ klibc-0.198/ash/Makefile 2005-02-06 15:56:36.478233705 +0100 > @@ -111,8 +111,7 @@ > $(OBJ_NODES): nodes.h > $(OBJ_SYNTAX): syntax.h > > -nodes.c nodes.h: mknodes.sh nodetypes nodes.c.pat nodes > -nodes: > +nodes.c nodes.h nodes: mknodes.sh nodetypes nodes.c.pat > sh mknodes.sh nodetypes nodes.c.pat . > > signames.c: mksignamesThis will lead to: ln -sf bltin/echo.c echo.c sh mknodes.sh nodetypes nodes.c.pat . ln -sf bltin/test.c test.c sh mknodes.sh nodetypes nodes.c.pat . mv y.tab.c arith.c gcc -Wp,-MD,.echo.d -Os -nostdinc -iwithprefix include -D__KLIBC__ -DBITSIZE=32 -I../include/arch/ppc -I../include/bits32 -I../include -I../linux/include -I../linux /include2 -I../linux/include -DSHELL -DJOBS=0 -I. -c -o echo.o echo.c gcc -Wp,-MD,.error.d -Os -nostdinc -iwithprefix include -D__KLIBC__ -DBITSIZE=32 -I../include/arch/ppc -I../include/bits32 -I../include -I../linux/include -I../linu x/include2 -I../linux/include -DSHELL -DJOBS=0 -I. -c -o error.o error.c mv: cannot stat `./nodes.h.tmp': No such file or directory as you can see, mknodes.sh is called twice with make -j