diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-01-24 23:49:54 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-01-24 23:49:54 +0000 |
commit | 2fa17d5ffcb075b18b740590355a90788815053e (patch) | |
tree | 5735726318e0a8538ab3c3cf9921274303cc0b68 | |
parent | 1aea189f37206b297243adab7dc340fa55dba3d0 (diff) | |
download | pkgsrc-2fa17d5ffcb075b18b740590355a90788815053e.tar.gz |
Update grub to 0.93. Changes in this version:
* Define the behavior of the boot loader when the load end address is
zero and the bss end address is zero in the Multiboot Specification.
Also, add the support into GRUB.
* Finally, we have a Bug Tracking System! Now the preferable way to
report bugs is to use the BTS rather than sending e-mail to bug-grub.
See <http://bugcomm.enbug.org/?project=grub&mode=project>, for more
details.
* The appendix "FAQ" in the manual is removed. See the GNU GRUB FAQ on
the web <http://www.gnu.org/software/grub/grub-faq.html> instead.
* The terminal handling code is rewritten radically, and many bugfixes
are made at the same time.
* The command "color" is effective even in the command-line.
* The command "terminal" takes two new options, ``--no-echo'' and
``--no-edit''. If you specify ``--no-echo'', GRUB won't echo back
input characters. If you specify ``--no-edit'', GRUB will disable the
BASH-like editing feature. These options are useful when using an
intelligent terminal (such as the comint mode in GNU Emacs).
* The utility ``grub-md5-crypt'' prompts to retype a password and checks
if the passwords match.
* Support for booting Linux is rewritten, so GRUB now supports
large-EBDA systems.
* The menu interfaces supports Page Up, Page Down, and Right Key.
* New command "terminfo", for vt100-incompatible terminals.
* New options, ``-D'', ``-g'' and ``-m'' are supported for FreeBSD.
-rw-r--r-- | sysutils/grub/Makefile | 5 | ||||
-rw-r--r-- | sysutils/grub/PLIST | 12 | ||||
-rw-r--r-- | sysutils/grub/distinfo | 8 | ||||
-rw-r--r-- | sysutils/grub/patches/patch-aa | 13 | ||||
-rw-r--r-- | sysutils/grub/patches/patch-ab | 13 |
5 files changed, 41 insertions, 10 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index b4edb1c6a0e..8558dac91eb 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:00 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/24 23:49:54 jmmv Exp $ # -DISTNAME= grub-0.92 +DISTNAME= grub-0.93 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ @@ -41,4 +41,5 @@ CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} .include "../../devel/binutils/buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index cc3ba1f64aa..7e37c56adb0 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,19 +1,23 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:01 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/01/24 23:49:54 jmmv Exp $ bin/mbchk -@unexec install-info --delete --info-dir=%D/info %D/info/grub.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/grub.info info/grub.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/grub.info info/grub.info-1 info/grub.info-2 info/grub.info-3 -@unexec install-info --delete --info-dir=%D/info %D/info/multiboot.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/multiboot.info info/multiboot.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/multiboot.info man/man1/mbchk.1 man/man8/grub-install.8 man/man8/grub-md5-crypt.8 +man/man8/grub-terminfo.8 man/man8/grub.8 sbin/grub sbin/grub-install sbin/grub-md5-crypt +sbin/grub-terminfo ${NETBOOT}share/doc/grub/README.netboot share/grub/${MACHINE_ARCH}-/e2fs_stage1_5 share/grub/${MACHINE_ARCH}-/fat_stage1_5 @@ -27,8 +31,6 @@ share/grub/${MACHINE_ARCH}-/stage1 share/grub/${MACHINE_ARCH}-/stage2 share/grub/${MACHINE_ARCH}-/vstafs_stage1_5 share/grub/${MACHINE_ARCH}-/xfs_stage1_5 -@exec install-info --info-dir=%D/info %D/info/grub.info -@exec install-info --info-dir=%D/info %D/info/multiboot.info @dirrm share/grub/${MACHINE_ARCH}- @dirrm share/grub ${NETBOOT}@dirrm share/doc/grub diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index 69631368843..a4a4eed6b11 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/04/30 12:09:56 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/01/24 23:49:54 jmmv Exp $ -SHA1 (grub-0.92.tar.gz) = 15bd5aaa816728583235ab0d5477c1ac32855583 -Size (grub-0.92.tar.gz) = 877112 bytes +SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8 +Size (grub-0.93.tar.gz) = 891032 bytes +SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34 +SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990 diff --git a/sysutils/grub/patches/patch-aa b/sysutils/grub/patches/patch-aa new file mode 100644 index 00000000000..c4698f6951f --- /dev/null +++ b/sysutils/grub/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2003/01/24 23:49:55 jmmv Exp $ + +--- grub/main.c.orig Mon Jun 10 18:20:38 2002 ++++ grub/main.c +@@ -31,7 +31,7 @@ int grub_stage2 (void); + + #define WITHOUT_LIBC_STUBS 1 + #include <shared.h> +-#include <term.h> ++#include "../stage2/term.h" + + char *program_name = 0; + int use_config_file = 1; diff --git a/sysutils/grub/patches/patch-ab b/sysutils/grub/patches/patch-ab new file mode 100644 index 00000000000..bfc82e72f6c --- /dev/null +++ b/sysutils/grub/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/01/24 23:49:55 jmmv Exp $ + +--- grub/asmstub.c.orig Tue Dec 3 00:20:45 2002 ++++ grub/asmstub.c +@@ -61,7 +61,7 @@ int grub_stage2 (void); + #include <shared.h> + #include <device.h> + #include <serial.h> +-#include <term.h> ++#include "../stage2/term.h" + + /* Simulated memory sizes. */ + #define EXTENDED_MEMSIZE (3 * 1024 * 1024) /* 3MB */ |