Browse Source

Rename .lilo extension to .lkrn and updated dependencies

tags/v0.9.3
Marty Connor 17 years ago
parent
commit
28d8d828b3

+ 5
- 5
src/arch/i386/Makefile View File

68
 OBJS_lmelfdprefix	= lmelfdprefix zlmelfdprefix
68
 OBJS_lmelfdprefix	= lmelfdprefix zlmelfdprefix
69
 CFLAGS_zlmelfdprefix	= $(CFLAGS_ZPREFIX)
69
 CFLAGS_zlmelfdprefix	= $(CFLAGS_ZPREFIX)
70
 
70
 
71
-MEDIA			+= lilo
72
-OBJS_liloprefix		= liloprefix zliloprefix
73
-CFLAGS_zliloprefix	= $(CFLAGS_ZPREFIX)
71
+MEDIA			+= lkrn
72
+OBJS_lkrnprefix		= lkrnprefix zlkrnprefix
73
+CFLAGS_zlkrnprefix	= $(CFLAGS_ZPREFIX)
74
 
74
 
75
 MEDIA			+= bImage
75
 MEDIA			+= bImage
76
 OBJS_bImageprefix	= bImageprefix zbImageprefix
76
 OBJS_bImageprefix	= bImageprefix zbImageprefix
113
 
113
 
114
 # rule to make a non-emulation ISO boot image
114
 # rule to make a non-emulation ISO boot image
115
 NON_AUTO_MEDIA		+= iso
115
 NON_AUTO_MEDIA		+= iso
116
-%iso:	%lilo util/geniso
116
+%iso:	%lkrn util/geniso
117
 	ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
117
 	ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
118
 
118
 
119
 # rule to make a floppy emulation ISO boot image
119
 # rule to make a floppy emulation ISO boot image
120
 NON_AUTO_MEDIA		+= liso
120
 NON_AUTO_MEDIA		+= liso
121
-%liso:	%lilo util/genliso
121
+%liso:	%lkrn util/genliso
122
 	bash util/genliso $@ $<
122
 	bash util/genliso $@ $<
123
 
123
 
124
 # rule to make a USB disk image
124
 # rule to make a USB disk image

+ 1
- 1
src/arch/i386/prefix/bImageprefix.S View File

91
 
91
 
92
 /* 
92
 /* 
93
 	This is a minimal boot sector.	If anyone tries to execute it (e.g., if
93
 	This is a minimal boot sector.	If anyone tries to execute it (e.g., if
94
-	a .lilo file is dd'ed to a floppy), print an error message. 
94
+	a .lkrn file is dd'ed to a floppy), print an error message. 
95
 */
95
 */
96
 
96
 
97
 bootsector: 
97
 bootsector: 

src/arch/i386/prefix/liloprefix.S → src/arch/i386/prefix/lkrnprefix.S View File


+ 5
- 5
src/util/geniso View File

2
 #
2
 #
3
 # Generate a isolinux ISO boot image
3
 # Generate a isolinux ISO boot image
4
 #
4
 #
5
-# geniso foo.iso foo.zlilo
5
+# geniso foo.iso foo.lkrn
6
 #
6
 #
7
-# the ISO image is the first argument so that a list of .zlilo images
7
+# the ISO image is the first argument so that a list of .lkrn images
8
 # to include can be specified
8
 # to include can be specified
9
 #
9
 #
10
 case $# in
10
 case $# in
11
 0|1)
11
 0|1)
12
-	echo Usage: $0 foo.iso foo.zlilo ...
12
+	echo Usage: $0 foo.iso foo.lkrn ...
13
 	exit 1
13
 	exit 1
14
 	;;
14
 	;;
15
 esac
15
 esac
40
 		continue
40
 		continue
41
 	fi
41
 	fi
42
 	b=$(basename $f)
42
 	b=$(basename $f)
43
-	g=${b%.zlilo}
44
-	g=${g//[^a-z0-9]}.zli
43
+	g=${b%.lkrn}
44
+	g=${g//[^a-z0-9]}.krn
45
 	case "$first" in
45
 	case "$first" in
46
 	"")
46
 	"")
47
 		echo DEFAULT $g
47
 		echo DEFAULT $g

+ 6
- 6
src/util/genliso View File

2
 #
2
 #
3
 # Generate a legacy floppy emulation ISO boot image
3
 # Generate a legacy floppy emulation ISO boot image
4
 #
4
 #
5
-# genliso foo.liso foo.zlilo
5
+# genliso foo.liso foo.lkrn
6
 #
6
 #
7
-# the ISO image is the first argument so that a list of .zlilo images
7
+# the ISO image is the first argument so that a list of .lkrn images
8
 # to include can be specified
8
 # to include can be specified
9
 #
9
 #
10
 case $0 in
10
 case $0 in
16
 esac
16
 esac
17
 case $# in
17
 case $# in
18
 0|1)
18
 0|1)
19
-	echo Usage: $0 foo.liso foo.zlilo ...
19
+	echo Usage: $0 foo.liso foo.lkrn ...
20
 	exit 1
20
 	exit 1
21
 	;;
21
 	;;
22
 esac
22
 esac
23
 case "`mtools -V`" in
23
 case "`mtools -V`" in
24
-Mtools\ version\ 3.9.9*|Mtools\ version\ 4.*)
24
+Mtools\ version\ 3.9.9*|Mtools\ version\ 3.9.1[0-9]*|Mtools\ version\ 4.*)
25
 	;;
25
 	;;
26
 *)
26
 *)
27
 	echo Mtools version 3.9.9 or later is required
27
 	echo Mtools version 3.9.9 or later is required
57
 	fi
57
 	fi
58
 	# shorten name for 8.3 filesystem
58
 	# shorten name for 8.3 filesystem
59
 	b=$(basename $f)
59
 	b=$(basename $f)
60
-	g=${b%.zlilo}
60
+	g=${b%.lkrn}
61
 	g=${g//[^a-z0-9]}
61
 	g=${g//[^a-z0-9]}
62
-	g=${g:0:8}.zli
62
+	g=${g:0:8}.krn
63
 	case "$first" in
63
 	case "$first" in
64
 	"")
64
 	"")
65
 		echo DEFAULT $g
65
 		echo DEFAULT $g

+ 0
- 40
src/util/makelilo.pl View File

1
-#!/usr/bin/perl -w
2
-
3
-use constant SYSSIZE_LOC => 500;	# bytes from beginning of boot block
4
-use constant MINSIZE => 32768;
5
-
6
-use strict;
7
-
8
-use bytes;
9
-
10
-$#ARGV >= 1 or die "Usage: $0 liloprefix file ...\n";
11
-open(L, "$ARGV[0]") or die "$ARGV[0]: $!\n";
12
-undef($/);
13
-my $liloprefix = <L>;
14
-close(L);
15
-length($liloprefix) >= 512 or die "LILO prefix too short\n";
16
-shift(@ARGV);
17
-my $totalsize = 0;
18
-for my $file (@ARGV) {
19
-	next if (! -f $file or ! -r $file);
20
-	$totalsize += -s $file;
21
-}
22
-my $pad = 0;
23
-if ($totalsize < MINSIZE) {
24
-	$pad = MINSIZE - $totalsize;
25
-	$totalsize = MINSIZE;
26
-}
27
-print STDERR "LILO payload is $totalsize bytes\n";
28
-$totalsize += 16;
29
-$totalsize >>= 4;
30
-substr($liloprefix, SYSSIZE_LOC, 2) = pack('v', $totalsize);
31
-print $liloprefix;
32
-for my $file (@ARGV) {
33
-	next unless open(I, "$file");
34
-	undef($/);
35
-	my $data = <I>;
36
-	print $data;
37
-	close(I);
38
-}
39
-print "\x0" x $pad;
40
-exit(0);

Loading…
Cancel
Save