diff options
author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:19:48 +0000 |
---|---|---|
committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:19:48 +0000 |
commit | 39867232c59373e94f4717ff7a46e985142f50b8 (patch) | |
tree | b30b0f0224b1a80bfd37d4aeb95c6060c5788870 /mdk-stage1 | |
parent | 8200c39fa90d9b3de3c18ec35fa46418aef52078 (diff) | |
download | drakx-backup-do-not-use-39867232c59373e94f4717ff7a46e985142f50b8.tar drakx-backup-do-not-use-39867232c59373e94f4717ff7a46e985142f50b8.tar.gz drakx-backup-do-not-use-39867232c59373e94f4717ff7a46e985142f50b8.tar.bz2 drakx-backup-do-not-use-39867232c59373e94f4717ff7a46e985142f50b8.tar.xz drakx-backup-do-not-use-39867232c59373e94f4717ff7a46e985142f50b8.zip |
Add x86-64, use glibc in init and stage1 as dietlibc is not working enough
and minilibc for init doesn't seem to let umounting take place at the end
of installation.
Diffstat (limited to 'mdk-stage1')
-rw-r--r-- | mdk-stage1/Makefile | 34 | ||||
-rw-r--r-- | mdk-stage1/Makefile.common | 3 |
2 files changed, 33 insertions, 4 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 81378031d..d94a49c12 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -33,6 +33,10 @@ # init with glibc # stage1 with glibc # + # x86-64 + # init with glibc + # stage1 with glibc + # #***************************************************************************** @@ -53,6 +57,12 @@ ifeq (i386, $(ARCH)) INITSRC = minilibc.c init.c INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin else +ifeq (x86_64, $(ARCH)) +#INITSRC = minilibc.c init.c +#INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin +INITSRC = init.c +INIT_DEFS = -DINIT_HEADERS=\"init-libc-headers.h\" $(GLIBC_INCLUDES) +else INITSRC = init.c ifeq (ia64, $(ARCH)) INIT_DEFS = -DINIT_HEADERS=\"init-libc-headers.h\" $(GLIBC_INCLUDES) @@ -60,6 +70,7 @@ else INIT_DEFS = -DINIT_HEADERS=\"init-libc-headers.h\" $(DIETLIBC_INCLUDES) endif endif +endif INITOBJS = $(subst .c,.o,$(INITSRC)) @@ -94,8 +105,12 @@ STAGE1_NETWORK_LIBS = $(top_dir)/dietlibc/bin-$(ARCH)/librpc.a endif ifeq (GLIBC, $(L)) +ifeq (x86_64, $(ARCH)) +STAGE1_NETWORK_LIBS = /usr/lib64/libresolv.a +else STAGE1_NETWORK_LIBS = /usr/lib/libresolv.a endif +endif #- stage1 itself STAGE1SRC = stage1.c log.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c @@ -130,6 +145,11 @@ STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWO ifeq (i386, $(ARCH)) LDFLAGS_INIT = -static -nostdlib /usr/lib/crt1.o else +ifeq (x86_64, $(ARCH)) +#LDFLAGS_INIT = -static -nostdlib /usr/lib64/crt1.o +LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1) +INIT_LIBC = $(GLIBC_LIBC) +else ifeq (ia64, $(ARCH)) LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1) INIT_LIBC = $(GLIBC_LIBC) @@ -138,6 +158,7 @@ LDFLAGS_INIT = $(DIETLIBC_LDFLAGS_STAGE1) INIT_LIBC = $(DIETLIBC_LIBC) endif endif +endif BINS = init stage1-full @@ -146,11 +167,17 @@ ifeq (i386, $(ARCH)) BINS += stage1-cdrom stage1-disk stage1-network stage1-usb endif -ifneq (ia64, $(ARCH)) +ifeq (i386, $(ARCH)) DIRS = dietlibc endif -DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt ppp/pppd rp-pppoe/src -ifeq (i386,$(ARCH)) +ifeq (ppc, $(ARCH)) +DIRS = dietlibc +endif +DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt +ifneq (x86_64, $(ARCH)) +DIRS += ppp/pppd rp-pppoe/src +endif +ifeq (i386, $(ARCH)) DIRS += pcmcia_ endif @@ -162,7 +189,6 @@ PCMCIA_LIB = $($(L)_PCMCIA_LIB) PCMCIA_DEFS = -DENABLE_PCMCIA endif - USB_DEFS_GEN = -DENABLE_USB USB_DEFS = -DENABLE_USB -DDISABLE_PCIADAPTERS diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index 7506c1381..088d70097 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -32,6 +32,9 @@ endif ifeq (ppc, $(ARCH)) L = GLIBC endif +ifeq (x86_64, $(ARCH)) +L = GLIBC +endif #- flags used by all stuff |