From 28d8d828b3c36ab05534951694c7e7999eae77cf Mon Sep 17 00:00:00 2001 From: Marty Connor Date: Fri, 6 Jul 2007 08:04:06 -0400 Subject: [PATCH] Rename .lilo extension to .lkrn and updated dependencies --- src/arch/i386/Makefile | 10 ++--- src/arch/i386/prefix/bImageprefix.S | 2 +- .../prefix/{liloprefix.S => lkrnprefix.S} | 0 src/util/geniso | 10 ++--- src/util/genliso | 12 +++--- src/util/makelilo.pl | 40 ------------------- 6 files changed, 17 insertions(+), 57 deletions(-) rename src/arch/i386/prefix/{liloprefix.S => lkrnprefix.S} (100%) delete mode 100755 src/util/makelilo.pl diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index f4e19d3f..bda22c8a 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 7d746ede..30020f73 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 similarity index 100% rename from src/arch/i386/prefix/liloprefix.S rename to src/arch/i386/prefix/lkrnprefix.S diff --git a/src/util/geniso b/src/util/geniso index 5bd5c7be..7642ed36 100755 --- a/src/util/geniso +++ b/src/util/geniso @@ -2,14 +2,14 @@ # # Generate a isolinux ISO boot image # -# geniso foo.iso foo.zlilo +# geniso foo.iso foo.lkrn # -# the ISO image is the first argument so that a list of .zlilo images +# the ISO image is the first argument so that a list of .lkrn images # to include can be specified # case $# in 0|1) - echo Usage: $0 foo.iso foo.zlilo ... + echo Usage: $0 foo.iso foo.lkrn ... exit 1 ;; esac @@ -40,8 +40,8 @@ do continue fi b=$(basename $f) - g=${b%.zlilo} - g=${g//[^a-z0-9]}.zli + g=${b%.lkrn} + g=${g//[^a-z0-9]}.krn case "$first" in "") echo DEFAULT $g diff --git a/src/util/genliso b/src/util/genliso index b8d9a11d..0a67eb3c 100755 --- a/src/util/genliso +++ b/src/util/genliso @@ -2,9 +2,9 @@ # # Generate a legacy floppy emulation ISO boot image # -# genliso foo.liso foo.zlilo +# genliso foo.liso foo.lkrn # -# the ISO image is the first argument so that a list of .zlilo images +# the ISO image is the first argument so that a list of .lkrn images # to include can be specified # case $0 in @@ -16,12 +16,12 @@ case $0 in esac case $# in 0|1) - echo Usage: $0 foo.liso foo.zlilo ... + echo Usage: $0 foo.liso foo.lkrn ... exit 1 ;; esac case "`mtools -V`" in -Mtools\ version\ 3.9.9*|Mtools\ version\ 4.*) +Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*) ;; *) echo Mtools version 3.9.9 or later is required @@ -57,9 +57,9 @@ do fi # shorten name for 8.3 filesystem b=$(basename $f) - g=${b%.zlilo} + g=${b%.lkrn} g=${g//[^a-z0-9]} - g=${g:0:8}.zli + g=${g:0:8}.krn case "$first" in "") echo DEFAULT $g diff --git a/src/util/makelilo.pl b/src/util/makelilo.pl deleted file mode 100755 index 8f995bc4..00000000 --- a/src/util/makelilo.pl +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/perl -w - -use constant SYSSIZE_LOC => 500; # bytes from beginning of boot block -use constant MINSIZE => 32768; - -use strict; - -use bytes; - -$#ARGV >= 1 or die "Usage: $0 liloprefix file ...\n"; -open(L, "$ARGV[0]") or die "$ARGV[0]: $!\n"; -undef($/); -my $liloprefix = ; -close(L); -length($liloprefix) >= 512 or die "LILO prefix too short\n"; -shift(@ARGV); -my $totalsize = 0; -for my $file (@ARGV) { - next if (! -f $file or ! -r $file); - $totalsize += -s $file; -} -my $pad = 0; -if ($totalsize < MINSIZE) { - $pad = MINSIZE - $totalsize; - $totalsize = MINSIZE; -} -print STDERR "LILO payload is $totalsize bytes\n"; -$totalsize += 16; -$totalsize >>= 4; -substr($liloprefix, SYSSIZE_LOC, 2) = pack('v', $totalsize); -print $liloprefix; -for my $file (@ARGV) { - next unless open(I, "$file"); - undef($/); - my $data = ; - print $data; - close(I); -} -print "\x0" x $pad; -exit(0);