diff options
| author | Marty Connor | 2007-07-06 14:04:06 +0200 |
|---|---|---|
| committer | Marty Connor | 2007-07-06 14:04:06 +0200 |
| commit | 28d8d828b3c36ab05534951694c7e7999eae77cf (patch) | |
| tree | 1cc521e58cd77f8ff4a7e7508648f07bec9d7820 /src/arch | |
| parent | Remap EBADF to PXENV_STATUS_TFTP_FILE_NOT_FOUND; the only user is (diff) | |
| download | ipxe-28d8d828b3c36ab05534951694c7e7999eae77cf.tar.gz ipxe-28d8d828b3c36ab05534951694c7e7999eae77cf.tar.xz ipxe-28d8d828b3c36ab05534951694c7e7999eae77cf.zip | |
Rename .lilo extension to .lkrn and updated dependencies
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/Makefile | 10 | ||||
| -rw-r--r-- | src/arch/i386/prefix/bImageprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/lkrnprefix.S (renamed from src/arch/i386/prefix/liloprefix.S) | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index f4e19d3f3..bda22c8af 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -68,9 +68,9 @@ MEDIA += lmelfd OBJS_lmelfdprefix = lmelfdprefix zlmelfdprefix CFLAGS_zlmelfdprefix = $(CFLAGS_ZPREFIX) -MEDIA += lilo -OBJS_liloprefix = liloprefix zliloprefix -CFLAGS_zliloprefix = $(CFLAGS_ZPREFIX) +MEDIA += lkrn +OBJS_lkrnprefix = lkrnprefix zlkrnprefix +CFLAGS_zlkrnprefix = $(CFLAGS_ZPREFIX) MEDIA += bImage OBJS_bImageprefix = bImageprefix zbImageprefix @@ -113,12 +113,12 @@ NON_AUTO_MEDIA += fd0 # rule to make a non-emulation ISO boot image NON_AUTO_MEDIA += iso -%iso: %lilo util/geniso +%iso: %lkrn util/geniso ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $< # rule to make a floppy emulation ISO boot image NON_AUTO_MEDIA += liso -%liso: %lilo util/genliso +%liso: %lkrn util/genliso bash util/genliso $@ $< # rule to make a USB disk image diff --git a/src/arch/i386/prefix/bImageprefix.S b/src/arch/i386/prefix/bImageprefix.S index 7d746ede3..30020f731 100644 --- a/src/arch/i386/prefix/bImageprefix.S +++ b/src/arch/i386/prefix/bImageprefix.S @@ -91,7 +91,7 @@ _prefix: /* This is a minimal boot sector. If anyone tries to execute it (e.g., if - a .lilo file is dd'ed to a floppy), print an error message. + a .lkrn file is dd'ed to a floppy), print an error message. */ bootsector: diff --git a/src/arch/i386/prefix/liloprefix.S b/src/arch/i386/prefix/lkrnprefix.S index 0857f3201..0857f3201 100644 --- a/src/arch/i386/prefix/liloprefix.S +++ b/src/arch/i386/prefix/lkrnprefix.S |