summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-09-21 02:28:43 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-09-21 02:28:43 +0000
commita13618645f9bbfb5a6a6f97ddfabf9c4dbfb3609 (patch)
treee0fa26dd726dc907b1763378d219f08d8e659912 /mdk-stage1
parent333012a6f9e4b69f35547299418542d70fb54db2 (diff)
downloaddrakx-a13618645f9bbfb5a6a6f97ddfabf9c4dbfb3609.tar
drakx-a13618645f9bbfb5a6a6f97ddfabf9c4dbfb3609.tar.gz
drakx-a13618645f9bbfb5a6a6f97ddfabf9c4dbfb3609.tar.bz2
drakx-a13618645f9bbfb5a6a6f97ddfabf9c4dbfb3609.tar.xz
drakx-a13618645f9bbfb5a6a6f97ddfabf9c4dbfb3609.zip
pcmcia works on x86_64 too, update stage1 build for 10.0
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/Makefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 76cd102a7..2757f3e50 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -62,6 +62,7 @@ else
ifeq (x86_64, $(ARCH))
INITSRC = minilibc.c init.c
INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin
+INIT_DEFS_ADD = -DBINARY=\"/sbin/stage1\"
else
INITSRC = init.c
ifeq (ia64, $(ARCH))
@@ -181,6 +182,9 @@ DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt ppp/pppd rp-ppp
ifeq (i386, $(ARCH))
DIRS += pcmcia_
endif
+ifeq (x86_64, $(ARCH))
+DIRS += pcmcia_
+endif
ifeq (i386,$(ARCH))
@@ -188,6 +192,11 @@ PCMCIA_LIB = pcmcia_/libpcmcia.a
PCMCIA_DEFS = -DENABLE_PCMCIA
endif
+ifeq (x86_64,$(ARCH))
+PCMCIA_LIB = pcmcia_/libpcmcia.a
+PCMCIA_DEFS = -DENABLE_PCMCIA
+endif
+
USB_DEFS_GEN = -DENABLE_USB
USB_DEFS = -DENABLE_USB -DDISABLE_PCIADAPTERS