diff options
| -rw-r--r-- | mdk-stage1/Makefile | 18 | ||||
| -rw-r--r-- | mdk-stage1/Makefile.common | 16 | ||||
| -rw-r--r-- | mdk-stage1/NEWS | 2 |
3 files changed, 2 insertions, 34 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 591100525..75e321400 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -59,9 +59,7 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS) INIT_DEFS = INITSRC = init.c -ifneq (DIETLIBC, $(L)) INIT_DEFS += $(GLIBC_INCLUDES) -endif STAGE1_DEFS=-DDISABLE_KA @@ -70,35 +68,19 @@ INITOBJS = $(subst .c,.o,$(INITSRC)) #- frontends NEWT_FRONTEND_SRC = newt-frontend.c -ifeq (DIETLIBC, $(L)) -NEWT_FRONTEND_LIBS = libnewt.a libslang.a -else NEWT_FRONTEND_LIBS = -lnewt -lslang -endif STDIO_FRONTEND_SRC = stdio-frontend.c STDIO_FRONTEND_LIBS = FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC)) -ifeq (DIETLIBC, $(L)) -FRONTEND_LINK = $(FRONTEND_OBJS) $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$($(F)_FRONTEND_LIBS)) -else FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS) -endif -ifeq (DIETLIBC, $(L)) -STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,libz.a libldetect.a libkmod.a libpci.a liblzma.a libsysfs.a) -else STAGE1_OWN_LIBS = -lz -lldetect -lkmod -lpci -llzma -lsysfs -endif -ifeq (DIETLIBC, $(L)) -STAGE1_NETWORK_LIBS = /usr/lib/dietlibc/lib-$(ARCH)/librpc.a -else STAGE1_NETWORK_LIBS = -lresolv -endif #- stage1 itself STAGE1SRC = stage1.c log.c utils.c params.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c zlibsupport.c diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index d225da69e..1f3442730 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -27,21 +27,7 @@ else F = NEWT endif -# diet libc syscalls are broken on mips -#ifneq (mips, $(ARCH)) -## diet libc eabi support is mostly broken -#ifneq (arm, $(ARCH)) -#DIET = $(shell test -x /usr/bin/diet && echo diet) -#endif -#endif - - -ifeq ($(DIET), diet) - #- default lib is dietlibc (honoured by main Makefile whenever possible) -L = DIETLIBC -else L = GLIBC -endif ifdef DEBUG OPTFLAGS = -g -DDEBUG @@ -58,8 +44,6 @@ CFLAGS += -Werror endif endif -DIETLIBC_INCLUDES = -I/usr/lib/dietlibc/include -I. -DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a GLIBC_INCLUDES = -I. INCLUDES = $($(L)_INCLUDES) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index f5406b6d9..fcb911d77 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- support dynamic linking only + 2.0 - kernel modules and firmware is needed during stage2, so move and symlink (symlinks are only for if you umount state2 /usr and want a still working initrd) |