diff options
| author | Michael Brown | 2009-04-16 04:15:08 +0200 |
|---|---|---|
| committer | Michael Brown | 2009-04-16 04:15:08 +0200 |
| commit | 7741546a406217827c3d4a8d72aaa322b2565c35 (patch) | |
| tree | a871a7879a035e76ae17cc096dc5317e4d8f400c /src/arch | |
| parent | [dhcp] Accept filename via DHCP option 67 as well as BOOTP filename field (diff) | |
| download | ipxe-7741546a406217827c3d4a8d72aaa322b2565c35.tar.gz ipxe-7741546a406217827c3d4a8d72aaa322b2565c35.tar.xz ipxe-7741546a406217827c3d4a8d72aaa322b2565c35.zip | |
[build] Pad .rom, .dsk, and .hd images to 512-byte boundaries
QEMU will silently round down a disk or ROM image file to the nearest
512 bytes. Fix by always padding .rom, .dsk and .hd images to the
nearest 512-byte boundary.
Originally-fixed-by: Stefan Hajnoczi <stefanha@gmail.com>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/Makefile | 7 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.pcbios | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index ca8ba1b2..9cf2bd69 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -114,13 +114,6 @@ NON_AUTO_MEDIA += fd0 $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0 $(Q)sync -# rule to create padded disk images -NON_AUTO_MEDIA += pdsk -%pdsk : %dsk - $(QM)$(ECHO) " [DSKPAD] $@" - $(Q)cp $< $@ - $(Q)$(PERL) ./util/dskpad.pl $@ - # Add NON_AUTO_MEDIA to the media list, so that they show up in the # output of "make" # diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index 64b3dac2..7aa0afd8 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -27,6 +27,12 @@ MEDIA += raw MEDIA += com MEDIA += exe +# Padding rules +# +PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@ +PAD_dsk = $(PADIMG) --blksize=512 $@ +PAD_hd = $(PADIMG) --blksize=512 $@ + # rule to make a non-emulation ISO boot image NON_AUTO_MEDIA += iso %iso: %lkrn util/geniso |