vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge prepare_0_5_94.

Browse source
This commit is contained in:
okuji 2000-03-18 22:44:41 +00:00
parent 562b652532
commit b56d735993
13 changed files with 698 additions and 702 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ChangeLog
View file

@ -1,3 +1,30 @@
2000-03-15 OKUJI Yoshinori <okuji@gnu.org>
* netboot/Makefile.am (EXTRA_libdrivers_a_SOURCES): 3c89x0.h ->
cs89x0.h. Just a typo.
2000-03-10 Gordon Matzigkeit <gord@fig.org>
* debian/rules: Strip mbchk.
* debian/postinst: Fix up /usr/doc symlink creation.
2000-03-01 OKUJI Yoshinori <okuji@gnu.org>
* netboot/fsys_tftp.c (tftp_dir): Add BUF_READ into FILEMAX
after BUF_EOF becomes non-zero. Reported by Per Lundberg.
2000-03-01 OKUJI Yoshinori <okuji@gnu.org>
* stage2/builtins.c (color_func): Return 1 if safe_parse_maxint
returns zero instead of non-zero. Reported by Magnus Holmberg
<pucko@lysator.liu.se>.
2000-02-29 OKUJI Yoshinori <okuji@gnu.org>
* grub/asmstub.c [__linux__]: Include <linux/kdev_t.h> for the
macro MAJOR. From Kalle Olavi Niemitalo <tosi@ees2.oulu.fi>.
2000-02-27 OKUJI Yoshinori <okuji@gnu.org>
* docs/tutorial.texi (Network): New chapter.

224
INSTALL
View file

@ -1,35 +1,96 @@
Basic Installation
==================
-*- Text -*-
These are generic installation instructions.
This is the GRUB. Welcome.
The `configure' shell script attempts to guess correct values for
This file contains instructions for compiling and installing the GRUB.
The Requirements
================
GRUB depends on some software packages installed into your system. If
you don't have any of them, please obtain and install them before
configuring the GRUB.
* GCC
Probably every recent GCC should work, but we recommend GCC 2.95 and
later, since you can create smaller binary images. See the webpage
<http://gcc.gnu.org/>.
* GNU Make
For now, the Makefiles produced by Automake depends on GNU Make. See
the webpage <http://www.gnu.org/software/make/make.html>.
* GNU binutils 2.9.1.0.23 or later
Binutils has changed the behavior of 16bit assembler between 2.9.1
and 2.9.1.0.x, and we support only 2.9.1.0.x and higher. It is
available from
<ftp://ftp.varesearch.com/pub/support/hjl/binutils/>. You don't have
to install it into a system directory. See the section "Operation
Controls".
* Texinfo 4.0 or later
We use some new macros in the documents, so you need a recent
Texinfo release. See the webpage
<http://www.gnu.org/software/texinfo/texinfo.html>.
If you obtain this source package from the CVS, these below are also
required.
* GNU Autoconf 20000116 or later
Some new macros are required, so you need to get an unrelease
version from the CVS. See the webpage
<http://sourceware.cygnus.com/autoconf/>.
* GNU Automake 19990620 or later
The new feature "per-executable flags" is required, so you need to
get an unreleased version from the CVS. See the webpage
<http://sourceware.cygnus.com/automake/>.
Caution: The recent versions are quite unstable, so check out a
rather old version from the CVS (1999-10-01 works fine, though it
has some non-critical bugs).
Configuring the GRUB
====================
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
you can run in the future to recreate the current configuration, a
file `config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
If you need to do unusual things to compile the package, please try to
figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
The file `configure.in' is used to create `configure' by a program
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
Building the GRUB
=================
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
1. `cd' to the directory containing the package's source code and
type `./configure' to configure the package for your system. If
you're using `csh' on an old version of System V, you might need
to type `sh ./configure' instead to prevent `csh' from trying to
execute `configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
@ -51,98 +112,51 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
this:
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
Or on systems that have the `env' program, you can do it like this:
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
own directory. `cd' to the directory where you want the object files
and executables to go and run the `configure' script. `configure'
automatically checks for the source code in the directory that
`configure' is in and in `..'.
If you have to use a `make' that does not supports the `VPATH'
variable, you have to compile the package for one architecture at a time
in the source code directory. After you have installed the package for
one architecture, use `make distclean' before reconfiguring for another
architecture.
Installation Names
==================
By default, `make install' will install the package's files in
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
installation prefix by giving `configure' the option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If
you give `configure' the option `--exec-prefix=PATH', the package will
use PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for
particular kinds of files. Run `configure --help' for a list of the
directories you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure'
the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Please note, however, that the GRUB knows where it is located in the
filesystem. If you have installed it in an unusual location, the
system might not work properly, or at all. The chief utility of these
options for the GRUB is to allow you to "install" in some alternate
location, and then copy these to the actual root filesystem later.
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' can not figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it can not guess the host type, give it the
`--host=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the host type.
If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
produce code for and the `--build=TYPE' option to select the type of
system on which you are compiling the package.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
@ -150,6 +164,7 @@ default values for variables like `CC', `cache_file', and `prefix'.
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Operation Controls
==================
@ -167,9 +182,7 @@ operates.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
Do not print messages saying which checks are being made.
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
@ -179,4 +192,37 @@ operates.
Print the version of Autoconf used to generate the `configure'
script, and exit.
`configure' also accepts some other, not widely useful, options.
`--disable-lba-support-bitmap-check'
Disable the check for LBA support bitmap. Specify this option
if you are sure that your BIOS has the INT 13 extension support,
but GRUB doesn't access your drives in LBA mode. This is
necessary because an incorrect LBA support bitmap is returned in
several buggy BIOSes. You can check if GRUB recognizes the INT 13
extension support by the command `geometry'.
`--disable-ext2fs'
Omit the ext2fs support in Stage 2.
`--disable-fat'
Omit the FAT support in Stage 2.
`--disable-ffs'
Omit the FFS support in Stage 2.
`--disable-minix'
Omit the Minix fs support in Stage 2.
`--disable-gunzip'
Omit the decompression support in Stage 2.
`--with-binutils=PATH'
Search the path PATH to find binutils. If you have installed your
binutils executables into an unusual location where GCC doesn't
search by default, use this option.
`--without-curses'
Don't use the curses library.
`configure' also accepts several options for the network support. See
the file `netboot/README.netboot', for more information.

2
NEWS
View file

@ -1,6 +1,6 @@
NEWS - list of user-visible changes between releases of GRUB
New in 0.5.94:
New in 0.5.94 - 2000-03-06:
* Stage 1 supports both the LBA mode and the CHS mode.
* The NetBSD and OpenBSD boot bug is fixed.
* The more automatic installation command "setup" is added.

59
README
View file

@ -11,65 +11,12 @@ personal computer BIOSes:
See the file NEWS for a description of recent changes to GRUB.
You need recent developmental environment to build GRUB. We recommend
you use the following utilities:
* binutils 2.9.1.0.23 or later (Do not use early 2.9.1.0.x!)
Binutils has changed the behavior of 16bit assembler between 2.9.1
and 2.9.1.0.x, and we support only 2.9.1.0.x and higher. It is available
from ftp.varesearch.com:/pub/support/hjl/binutils.
NOTE: you should check for the version of your binutils by the following
command:
$ gcc -Wl,-v 2>&1 | grep "GNU ld"
This will show two versions, like this:
GNU ld version 2.9.5 (with BFD 2.9.5.0.13)
The latter is what you should see. If you have installed a recent
version of binutils but this version number is not identical with it,
you need to specify the option ``--with-binutils=DIR'' for configure.
* texinfo 4.0 or later
We use some new macros in the manuals, so you need a recent TeXinfo
release. See http://www.gnu.org/software/texinfo/texinfo.html, for more
information.
These below are required when you develop GRUB or when you get it from
the CVS:
* automake 19990620 or later
The new feature, per-executable flags, is required, so you need to get
an unreleased version from the CVS. See
<http://sourceware.cygnus.com/automake/>, for more information.
Caution: The recent versions are quite unstable, so check out a rather
old version from the CVS (1999-10-01 works fine, though it has some
non-critical bugs).
* autoconf 20000116 or later
Some new macros are required, so you need to get an unreleased version
from the CVS. See <http://sourceware.cygnus.com/autoconf/>, for more
information.
Note: Perhaps a somewhat older CVS version should work well, but I'm not
sure. Using the latest version would be better.
If you are interested in netboot, see the file README.netboot under the
directory netboot.
If you are interested in the network support, see the file
README.netboot under the directory netboot.
See the file INSTALL for instructions on how to build and install the
GRUB data and program files. See the GRUB manual for details about
using GRUB as your bootloader.
using GRUB as your bootloader. Type "info grub" in the shell prompt.
GNU GRUB has a page on the web. See:

996
configure vendored
View file

File diff suppressed because it is too large Load diff

6
debian/changelog vendored
View file

@ -1,6 +1,10 @@
grub (0.5.94) unstable; urgency=low
--
* Fix /usr/doc symlink. (closes:bug#50932)
* Better testing for BIOS LBA support. (closes:bug#53507)
* New installation script. (closes:bug#48755)
-- Gordon Matzigkeit <gord@debian.org> Fri, 10 Mar 2000 14:55:02 -0600
grub (0.5.93.1) unstable; urgency=low

4
debian/postinst vendored
View file

@ -4,10 +4,10 @@ set -e
# Provide a backward-compatibility symlink to the doc directory.
package=grub
case "$1" in
install | upgrade)
configure)
if [ -d /usr/doc ]; then
if [ ! -e /usr/doc/$package -a -d /usr/share/doc/$package ]; then
ln -s /usr/share/doc/$package /usr/doc/$package
ln -sf ../share/doc/$package /usr/doc/$package
fi
fi
;;

2
debian/rules vendored
View file

@ -49,7 +49,7 @@ binary-arch: checkroot build
dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir
gzip -f9 debian/tmp/usr/share/info/* debian/tmp/usr/share/man/*/*
strip -s debian/tmp/usr/sbin/grub
strip -s debian/tmp/usr/sbin/grub debian/tmp/usr/bin/mbchk
$(INSTALL_DATA) TODO BUGS NEWS docs/menu.lst \
debian/tmp/usr/share/doc/grub/

1
grub/asmstub.c
View file

@ -44,6 +44,7 @@ int grub_stage2 (void);
# include <sys/ioctl.h> /* ioctl */
# include <linux/hdreg.h> /* HDIO_GETGEO */
# include <linux/major.h> /* FLOPPY_MAJOR */
# include <linux/kdev_t.h> /* MAJOR */
# if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))
/* Maybe libc doesn't have large file support. */
# include <linux/unistd.h> /* _llseek */

2
netboot/Makefile.am
View file

@ -15,7 +15,7 @@ libdrivers_a_SOURCES = byteorder.h config.c etherboot.h \
main.c misc.c netboot_config.h netdevice.h nic.h osdep.h \
pci.c pci.h
EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c90x.c cs89x0.c \
3c89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \
cs89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \
ns8390.c ns8390.h ntulip.c rtl8139.c sk_g16.c sk_g16.h \
smc9000.c smc9000.h tiara.c tulip.c tulip.h via-rhine.c
libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \

2
netboot/Makefile.in
View file

@ -97,7 +97,7 @@ libdrivers_a_SOURCES = byteorder.h config.c etherboot.h \
pci.c pci.h
EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c90x.c cs89x0.c \
3c89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \
cs89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \
ns8390.c ns8390.h ntulip.c rtl8139.c sk_g16.c sk_g16.h \
smc9000.c smc9000.h tiara.c tulip.c tulip.h via-rhine.c

3
netboot/fsys_tftp.c
View file

@ -430,6 +430,9 @@ tftp_dir (char *dirname)
}
while (! buf_eof);
/* Maybe a few amounts of data remains. */
filemax += buf_read;
/* Retry the open instruction. */
goto reopen;
}

4
stage2/builtins.c
View file

@ -561,7 +561,7 @@ color_func (char *arg, int flags)
highlight = skip_to (0, arg);
new_normal_color = color_number (normal);
if (new_normal_color < 0 && safe_parse_maxint (&normal, &new_normal_color))
if (new_normal_color < 0 && ! safe_parse_maxint (&normal, &new_normal_color))
return 1;
/* The second argument is optional, so set highlight_color
@ -573,7 +573,7 @@ color_func (char *arg, int flags)
{
new_highlight_color = color_number (highlight);
if (new_highlight_color < 0
&& safe_parse_maxint (&highlight, &new_highlight_color))
&& ! safe_parse_maxint (&highlight, &new_highlight_color))
return 1;
}