diff options
| author | Christian Hesse | 2014-05-13 18:38:52 +0200 |
|---|---|---|
| committer | Michael Brown | 2014-05-14 17:00:58 +0200 |
| commit | a8f037a275886ed533bb0c005bc5464757f76ca7 (patch) | |
| tree | dfb2abe30793ee360ac6105640b3657b78a04353 /src/arch/i386 | |
| parent | [undi] Apply quota only to number of complete received packets (diff) | |
| download | ipxe-a8f037a275886ed533bb0c005bc5464757f76ca7.tar.gz ipxe-a8f037a275886ed533bb0c005bc5464757f76ca7.tar.xz ipxe-a8f037a275886ed533bb0c005bc5464757f76ca7.zip | |
[build] Merge util/geniso and util/genliso
Rework geniso and genliso to provide a single merged utility for
generating ISO images.
Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/Makefile.pcbios | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index d3fe8b9e6..50e93144b 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -49,13 +49,13 @@ LIST_NAME_mrom := ROMS NON_AUTO_MEDIA += iso %iso: %lkrn util/geniso $(QM)$(ECHO) " [GENISO] $@" - $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $< + $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -o $@ $< # rule to make a floppy emulation ISO boot image NON_AUTO_MEDIA += liso -%liso: %lkrn util/genliso - $(QM)$(ECHO) " [GENLISO] $@" - $(Q)bash util/genliso $@ $< +%liso: %lkrn util/geniso + $(QM)$(ECHO) " [GENISO] $@" + $(Q)VERSION="$(VERSION)" bash util/geniso -l -o $@ $< # rule to make a syslinux floppy image (mountable, bootable) NON_AUTO_MEDIA += sdsk |