diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | kernel/modules.pl | 3 | ||||
| -rwxr-xr-x | kernel/update_kernel | 2 | ||||
| -rwxr-xr-x | make_boot_img | 4 | ||||
| -rw-r--r-- | mdk-stage1/.cvsignore | 2 | ||||
| -rw-r--r-- | mdk-stage1/Makefile | 18 | ||||
| -rw-r--r-- | mdk-stage1/modules.c | 2 |
7 files changed, 21 insertions, 12 deletions
@@ -7,7 +7,7 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) ifeq (i386,$(ARCH)) - BOOT_IMG = cdrom.img hd.img hd_usb.img network.img network_gigabit_usb.img blank.img pcmcia.img + BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit_usb.img blank.img pcmcia.img endif ifeq (sparc,$(ARCH)) BOOT_IMG = cdrom.img hd.img network.img live.img tftp.img tftprd.img diff --git a/kernel/modules.pl b/kernel/modules.pl index d0904eeaa..820ae36a1 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -95,7 +95,8 @@ my %images = ( => 'fs/network network/raw bus/usb network/gigabit|usb', network => 'fs/network network/raw bus/pcmcia network/main', hd => 'disk/raw fs/local|loopback disk/scsi|hardware_raid', - hd_usb => 'disk/raw fs/local|loopback bus/usb disk/usb bus/firewire disk/firewire', + hdcdrom_usb + => 'disk/cdrom|raw fs/local|loopback|cdrom bus/usb disk/usb bus/firewire disk/firewire', pcmcia => 'fs/cdrom disk/cdrom|raw|pcmcia bus/pcmcia fs/network network/pcmcia|raw', cdrom => 'fs/cdrom disk/cdrom|raw|scsi', all => 'fs/cdrom disk/cdrom|raw bus/usb disk/usb|scsi fs/loopback|local bus/pcmcia disk/pcmcia|hardware_raid fs/network network/main|pcmcia|usb|raw bus/firewire disk/firewire', diff --git a/kernel/update_kernel b/kernel/update_kernel index 4ed1ff246..1fbb97297 100755 --- a/kernel/update_kernel +++ b/kernel/update_kernel @@ -31,7 +31,7 @@ function create_modules_mar() { ls *.o | packdrake -b9s "modules.cz" 400000 echo "done" mv modules.cz ../modules.cz-$kern - for i in network network_gigabit_usb cdrom hd hd_usb pcmcia all; do + for i in network network_gigabit_usb cdrom hd hdcdrom_usb pcmcia all; do modules_var="${i}_modules" eval "create_marfile ${i}_modules.mar \$$modules_var" done diff --git a/make_boot_img b/make_boot_img index a9ff44501..78a3b0bc4 100755 --- a/make_boot_img +++ b/make_boot_img @@ -1,6 +1,6 @@ #!/usr/bin/perl -@ARGV >= 2 or die "usage: $0 <image> all|cdrom|hd|hd_usb|network|network_gigabit_usb|blank|pcmcia|live|tftp|tftprd\n"; +@ARGV >= 2 or die "usage: $0 <image> all|cdrom|hd|hdcdrom_usb|network|network_gigabit_usb|blank|pcmcia|live|tftp|tftprd\n"; use Config; use MDK::Common; @@ -44,7 +44,7 @@ $install = $ {{ network_gigabit_usb => "stage1-network-usb", cdrom => "stage1-cdrom", hd => "stage1-disk", - hd_usb => "stage1-disk-usb", + hdcdrom_usb => "stage1-medias-usb", live64 => "stage1-full", tftp64 => "stage1-full", tftprd64 => "stage1-full", 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) |