Add .pdsk target (padded .dsk, suitable for qemu).

diff --git a/contrib/bochs/README.qemu b/contrib/bochs/README.qemu
index e72c88415110574b83193522f5439a7008530a75..ee20eec47b01ad7b194780d4ff327e06e293d6ed 100644 (file)
--- a/contrib/bochs/README.qemu
+++ b/contrib/bochs/README.qemu
@@ -54,15 +54,14 @@ To get qemu running is fairly simple:
 
 8.  Build Etherboot floppy disk images and pad to 1.44MB
       pushd ../../src
-      make bin/rtl8139.dsk
-      ./util/dskpad.pl bin/rtl8139.dsk
+      make bin/rtl8139.pdsk
       popd
 
 9.  Start qemu
       export SDL_VIDEO_X11_DGAMOUSE=0
       ./qemu/i386-softmmu/qemu -L qemu/pc-bios \
                               -net nic,model=rtl8139 -net tap,ifname=tap0 \
-                              -boot a -fda ../../src/bin/rtl8139.dsk 
+                              -boot a -fda ../../src/bin/rtl8139.pdsk 
 
 You should see qemu start up, load up Etherboot and attempt to boot
 from the network.

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index f4e19d3f34f14ece82bfb75ef90110127fcd77e9..21a8e36d79b099a066a2e77475e44431714d67af 100644 (file)
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -111,6 +111,12 @@ NON_AUTO_MEDIA             += fd0
        dd if=$< bs=512 conv=sync of=/dev/fd0
        sync
 
+# rule to create padded disk images
+NON_AUTO_MEDIA         += pdsk
+%pdsk : %dsk
+       cp $< $@
+       $(PERL) ./util/dskpad.pl $@
+
 # rule to make a non-emulation ISO boot image
 NON_AUTO_MEDIA         += iso
 %iso:  %lilo util/geniso
@@ -125,6 +131,7 @@ NON_AUTO_MEDIA              += liso
 $(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
        $(OBJCOPY) -O binary $< $@
 
+NON_AUTO_MEDIA         += usb
 %usb: $(BIN)/usbdisk.bin %hd
        cat $^ > $@