summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-02-28 18:52:47 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-02-28 18:52:47 +0000
commit9bca9d4154a4fa2f3fcefae1065f06b9c8e15ecf (patch)
treeffb3d601a8fafa1783fe03d620911084ce5bfdca /mdk-stage1
parent1308f50d3153dc3e806734e1dd0fc9f0873aa53c (diff)
downloaddrakx-9bca9d4154a4fa2f3fcefae1065f06b9c8e15ecf.tar
drakx-9bca9d4154a4fa2f3fcefae1065f06b9c8e15ecf.tar.gz
drakx-9bca9d4154a4fa2f3fcefae1065f06b9c8e15ecf.tar.bz2
drakx-9bca9d4154a4fa2f3fcefae1065f06b9c8e15ecf.tar.xz
drakx-9bca9d4154a4fa2f3fcefae1065f06b9c8e15ecf.zip
hd_usb.img -> hdcdrom_usb.img
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/.cvsignore2
-rw-r--r--mdk-stage1/Makefile18
-rw-r--r--mdk-stage1/modules.c2
3 files changed, 15 insertions, 7 deletions
diff --git a/mdk-stage1/.cvsignore b/mdk-stage1/.cvsignore
index d0c39e65c..d6a8a8434 100644
--- a/mdk-stage1/.cvsignore
+++ b/mdk-stage1/.cvsignore
@@ -2,7 +2,7 @@ init
stage1-full
stage1-cdrom
stage1-disk
-stage1-disk-usb
+stage1-medias-usb
stage1-network
stage1-network-usb
debug.log
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 4d7ed6906..60cda03d3 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -113,11 +113,15 @@ CDROM_DEFS = -DDISABLE_DISK -DDISABLE_NETWORK
STAGE1OBJS-DISK = $(subst .c,-DISK.o,$(STAGE1SRC) $(DISKSRC))
-STAGE1OBJS-DISK-USB = $(subst .c,-DISK-USB.o,$(STAGE1SRC) $(DISKSRC))
DISK_DEFS = -DDISABLE_CDROM -DDISABLE_NETWORK
+STAGE1OBJS-MEDIAS-USB = $(subst .c,-MEDIAS-USB.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC))
+
+MEDIAS-USB_DEFS = -DDISABLE_NETWORK
+
+
STAGE1OBJS-NETWORK = $(subst .c,-NETWORK.o,$(STAGE1SRC) $(NETWORKSRC))
STAGE1OBJS-NETWORK-USB = $(subst .c,-NETWORK-USB.o,$(STAGE1SRC) $(NETWORKSRC))
@@ -143,7 +147,7 @@ endif
BINS = init stage1-full
ifeq (i386, $(ARCH))
-BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-disk-usb
+BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-medias-usb
endif
ifneq (ia64, $(ARCH))
@@ -185,7 +189,7 @@ stage1-disk: $(STAGE1OBJS-DISK) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIB
$(CC) $(LDFLAGS_STAGE1) -o $@ $^
$(STRIPCMD) $@
-stage1-disk-usb: $(STAGE1OBJS-DISK-USB) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+stage1-medias-usb: $(STAGE1OBJS-MEDIAS-USB) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
$(CC) $(LDFLAGS_STAGE1) -o $@ $^
$(STRIPCMD) $@
@@ -211,8 +215,8 @@ $(STAGE1OBJS-CDROM): %-CDROM.o: %.c
$(STAGE1OBJS-DISK): %-DISK.o: %.c
$(COMPILE) $(INCLUDES) $(DISK_DEFS) -c $< -o $@
-$(STAGE1OBJS-DISK-USB): %-DISK-USB.o: %.c
- $(COMPILE) $(INCLUDES) $(DISK_DEFS) $(USB_DEFS_GEN) -c $< -o $@
+$(STAGE1OBJS-MEDIAS-USB): %-MEDIAS-USB.o: %.c
+ $(COMPILE) $(INCLUDES) $(MEDIAS-USB_DEFS) $(USB_DEFS_GEN) -c $< -o $@
$(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) -c $< -o $@
@@ -259,8 +263,12 @@ endif
*-DISK.o: %-DISK.o: %.o
+*-MEDIAS-USB.o: %-MEDIAS-USB.o: %.o
+
*-NETWORK.o: %-NETWORK.o: %.o
+*-NETWORK-USB.o: %-NETWORK-USB.o: %.o
+
*-USB.o: %-USB.o: %.o
*-FULL.o: %-FULL.o: %.o
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 083a81e6a..283d6123a 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -55,7 +55,7 @@ static enum insmod_return insmod_archived_file(const char * mod_name, char * opt
strcat(module_name, ".o");
i = mar_extract_file(archive_name, module_name, "/tmp/");
if (i == 1) {
- log_message("file-not-found-in-archive %s (maybe you can try another boot floppy such as 'other.img' for seldom used SCSI modules)", module_name);
+ log_message("file-not-found-in-archive %s (maybe you can try another boot floppy such as 'hdcdrom_usb.img' or 'network_gigabit_usb.img')", module_name);
return INSMOD_FAILED_FILE_NOT_FOUND;
}
if (i != 0)