Update to 2003/1/13 Grub cvs base
This commit is contained in:
parent
b8182b97d8
commit
8625a7397e
12 changed files with 121 additions and 159 deletions
|
@ -1,13 +1,12 @@
|
|||
$NetBSD: patch-aa,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- INSTALL.orig 2004-04-04 15:45:59.000000000 +0200
|
||||
--- INSTALL.orig 2006-01-03 18:58:02.000000000 +0100
|
||||
+++ INSTALL
|
||||
@@ -14,6 +14,8 @@ configuring the GRUB.
|
||||
* GCC 2.95 or later
|
||||
@@ -15,6 +15,7 @@ configuring the GRUB.
|
||||
* GNU Make
|
||||
* GNU Bison
|
||||
* GNU binutils 2.9.1.0.23 or later
|
||||
+* GNU glibc or argp-standalone
|
||||
+* GNU bison
|
||||
+* GNU Glibc or argp-standalone
|
||||
* Other standard GNU/Unix tools
|
||||
* LZO 1.02 or later
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ab,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ab,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- Makefile.in.orig 2005-11-18 15:56:55.000000000 +0100
|
||||
--- Makefile.in.orig 2006-01-03 18:58:02.000000000 +0100
|
||||
+++ Makefile.in
|
||||
@@ -57,17 +57,23 @@ mkinstalldirs = $(srcdir)/mkinstalldirs
|
||||
@@ -57,10 +57,13 @@ mkinstalldirs = $(srcdir)/mkinstalldirs
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = -I. -Iinclude -I$(srcdir)/include -Wall -W
|
||||
|
@ -19,13 +19,13 @@ $NetBSD: patch-ab,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
OBJCOPY = @OBJCOPY@
|
||||
STRIP = @STRIP@
|
||||
NM = @NM@
|
||||
LD = @LD@
|
||||
RUBY = @RUBY@
|
||||
+YACC = @YACC@
|
||||
LIBCURSES = @LIBCURSES@
|
||||
@@ -70,6 +73,9 @@ LIBCURSES = @LIBCURSES@
|
||||
LIBLZO = @LIBLZO@
|
||||
YACC = @YACC@
|
||||
|
||||
+LIBARGP = @LIBARGP@
|
||||
+LIBMALLOC = @LIBMALLOC@
|
||||
|
||||
+
|
||||
### General variables.
|
||||
|
||||
RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ac,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ac,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- conf/i386-pc.mk.orig 2005-12-03 18:54:55.000000000 +0100
|
||||
--- conf/i386-pc.mk.orig 2005-12-25 16:59:50.000000000 +0100
|
||||
+++ conf/i386-pc.mk
|
||||
@@ -1310,7 +1310,7 @@ grub_emu-grub_emu_init.d: grub_emu_init.
|
||||
@@ -1335,7 +1335,7 @@ grub_emu-grub_emu_init.d: grub_emu_init.
|
||||
-include grub_emu-grub_emu_init.d
|
||||
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ad,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ad,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- conf/i386-pc.rmk.orig 2005-12-03 18:54:55.000000000 +0100
|
||||
--- conf/i386-pc.rmk.orig 2005-12-25 16:59:50.000000000 +0100
|
||||
+++ conf/i386-pc.rmk
|
||||
@@ -100,7 +100,7 @@ grub_emu_SOURCES = commands/boot.c comma
|
||||
@@ -101,7 +101,7 @@ grub_emu_SOURCES = commands/boot.c comma
|
||||
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
||||
util/i386/pc/misc.c grub_emu_init.c
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ae,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ae,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- configure.ac.orig 2005-12-10 06:24:58.000000000 +0100
|
||||
--- configure.ac.orig 2006-01-03 18:58:02.000000000 +0100
|
||||
+++ configure.ac
|
||||
@@ -131,7 +131,6 @@ if test "x$build" != "x$host"; then
|
||||
@@ -128,7 +128,6 @@ if test "x$build" != "x$host"; then
|
||||
[AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])])
|
||||
else
|
||||
BUILD_CC="$CC"
|
||||
|
@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
fi
|
||||
|
||||
# Test the C compiler for the build environment.
|
||||
@@ -139,10 +138,24 @@ tmp_CC="$CC"
|
||||
@@ -136,10 +135,24 @@ tmp_CC="$CC"
|
||||
tmp_CFLAGS="$CFLAGS"
|
||||
tmp_LDFLAGS="$LDFLAGS"
|
||||
tmp_CPPFLAGS="$CPPFLAGS"
|
||||
|
@ -36,7 +36,7 @@ $NetBSD: patch-ae,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
|
||||
# Identify characteristics of the build architecture.
|
||||
AC_C_BIGENDIAN
|
||||
@@ -171,6 +184,12 @@ AC_CHECK_LIB(ncurses, wgetch, [LIBCURSES
|
||||
@@ -168,6 +181,12 @@ AC_CHECK_LIB(ncurses, wgetch, [LIBCURSES
|
||||
[AC_CHECK_LIB(curses, wgetch, [LIBCURSES="-lcurses"])])
|
||||
AC_SUBST(LIBCURSES)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-af,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-af,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- configure.orig 2005-12-10 06:24:58.000000000 +0100
|
||||
--- configure.orig 2006-01-03 18:58:02.000000000 +0100
|
||||
+++ configure
|
||||
@@ -311,7 +311,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
|
@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -4268,7 +4268,6 @@ echo "$as_me: error: none of gcc, egcs a
|
||||
@@ -4209,7 +4209,6 @@ echo "$as_me: error: none of gcc, egcs a
|
||||
|
||||
else
|
||||
BUILD_CC="$CC"
|
||||
|
@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
fi
|
||||
|
||||
# Test the C compiler for the build environment.
|
||||
@@ -4276,10 +4275,24 @@ tmp_CC="$CC"
|
||||
@@ -4217,10 +4216,24 @@ tmp_CC="$CC"
|
||||
tmp_CFLAGS="$CFLAGS"
|
||||
tmp_LDFLAGS="$LDFLAGS"
|
||||
tmp_CPPFLAGS="$CPPFLAGS"
|
||||
|
@ -45,7 +45,7 @@ $NetBSD: patch-af,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
|
||||
# Identify characteristics of the build architecture.
|
||||
echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
|
||||
@@ -6438,6 +6451,176 @@ fi
|
||||
@@ -6351,6 +6364,176 @@ fi
|
||||
|
||||
|
||||
|
||||
|
@ -222,7 +222,7 @@ $NetBSD: patch-af,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
|||
# Check for headers.
|
||||
|
||||
|
||||
@@ -7251,10 +7434,14 @@ s,@LD@,$LD,;t t
|
||||
@@ -7163,10 +7346,14 @@ s,@LD@,$LD,;t t
|
||||
s,@ac_ct_LD@,$ac_ct_LD,;t t
|
||||
s,@RUBY@,$RUBY,;t t
|
||||
s,@BUILD_CC@,$BUILD_CC,;t t
|
||||
|
|
|
@ -1,37 +1,12 @@
|
|||
$NetBSD: patch-ag,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ag,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- geninit.sh.orig 2005-11-13 16:47:08.000000000 +0100
|
||||
+++ geninit.sh
|
||||
@@ -41,12 +41,10 @@ void
|
||||
grub_init_all (void)
|
||||
{
|
||||
EOF
|
||||
-(
|
||||
- cat grub_modules_init.lst
|
||||
- for i in $*; do
|
||||
- echo $i':'
|
||||
- done
|
||||
-) | sort -r | uniq -d -W1 -t':' | sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/ grub_\1_init ();/;p;}'
|
||||
+
|
||||
+for i in $*; do
|
||||
+ (sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/ grub_\1_init ();/;p;}' < $i)
|
||||
+done
|
||||
--- include/grub/mm.h.orig 2005-08-22 19:28:59.000000000 +0200
|
||||
+++ include/grub/mm.h
|
||||
@@ -33,6 +33,7 @@ void *EXPORT_FUNC(grub_malloc) (grub_siz
|
||||
void EXPORT_FUNC(grub_free) (void *ptr);
|
||||
void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
|
||||
void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
|
||||
+void EXPORT_FUNC(__enable_execute_stack) ();
|
||||
|
||||
cat <<EOF
|
||||
}
|
||||
@@ -58,12 +56,9 @@ grub_fini_all (void)
|
||||
{
|
||||
EOF
|
||||
|
||||
-(
|
||||
- cat grub_modules_init.lst
|
||||
- for i in $*; do
|
||||
- echo $i':'
|
||||
- done
|
||||
-) | sort -r | uniq -d -W1 -t':' | sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/ grub_\1_fini ();/;p;}'
|
||||
+for i in $*; do
|
||||
+ (sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/ grub_\1_fini ();/;p;}' < $i)
|
||||
+done
|
||||
|
||||
cat <<EOF
|
||||
}
|
||||
/* For debugging. */
|
||||
#define MM_DEBUG 1
|
||||
|
|
|
@ -1,12 +1,18 @@
|
|||
$NetBSD: patch-ah,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ah,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- include/grub/mm.h.orig 2005-08-22 19:28:59.000000000 +0200
|
||||
+++ include/grub/mm.h
|
||||
@@ -33,6 +33,7 @@ void *EXPORT_FUNC(grub_malloc) (grub_siz
|
||||
void EXPORT_FUNC(grub_free) (void *ptr);
|
||||
void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
|
||||
void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
|
||||
+void EXPORT_FUNC(__enable_execute_stack) ();
|
||||
|
||||
/* For debugging. */
|
||||
#define MM_DEBUG 1
|
||||
--- kern/mm.c.orig 2005-08-21 20:42:54.000000000 +0200
|
||||
+++ kern/mm.c
|
||||
@@ -420,3 +420,13 @@ grub_mm_dump (unsigned lineno)
|
||||
grub_printf ("\n");
|
||||
}
|
||||
#endif /* MM_DEBUG */
|
||||
+
|
||||
+/*
|
||||
+ * XXX: gcc on systems using non-executable mapping of stack generates
|
||||
+ * reference to __enable_execute_stack() (libgcc)
|
||||
+ * Probably there's better way to solve this, than such an ugly workaround.
|
||||
+ */
|
||||
+
|
||||
+void __enable_execute_stack (void);
|
||||
+void __enable_execute_stack (void) {}
|
||||
+
|
||||
|
|
|
@ -1,18 +1,24 @@
|
|||
$NetBSD: patch-ai,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ai,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- kern/mm.c.orig 2005-08-21 20:42:54.000000000 +0200
|
||||
+++ kern/mm.c
|
||||
@@ -420,3 +420,13 @@ grub_mm_dump (unsigned lineno)
|
||||
grub_printf ("\n");
|
||||
--- util/grub-emu.c.orig 2005-11-13 16:47:09.000000000 +0100
|
||||
+++ util/grub-emu.c
|
||||
@@ -172,6 +172,9 @@ main (int argc, char *argv[])
|
||||
sleep (1);
|
||||
}
|
||||
#endif /* MM_DEBUG */
|
||||
+
|
||||
+/*
|
||||
+ * XXX: gcc on systems using non-executable mapping of stack generates
|
||||
+ * reference to __enable_execute_stack() (libgcc)
|
||||
+ * Probably there's better way to solve this, than such an ugly workaround.
|
||||
+ */
|
||||
+
|
||||
+void __enable_execute_stack (void);
|
||||
+void __enable_execute_stack (void) {}
|
||||
|
||||
+ /* XXX: This is a bit unportable. */
|
||||
+ grub_util_biosdisk_init (args.dev_map);
|
||||
+
|
||||
/* Make sure that there is a root device. */
|
||||
if (! args.root_dev)
|
||||
{
|
||||
@@ -189,9 +192,6 @@ main (int argc, char *argv[])
|
||||
|
||||
grub_env_set ("prefix", rootprefix);
|
||||
|
||||
- /* XXX: This is a bit unportable. */
|
||||
- grub_util_biosdisk_init (args.dev_map);
|
||||
-
|
||||
grub_init_all ();
|
||||
|
||||
/* Start GRUB! */
|
||||
|
|
|
@ -1,24 +1,21 @@
|
|||
$NetBSD: patch-aj,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-aj,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- util/grub-emu.c.orig 2005-11-13 16:47:09.000000000 +0100
|
||||
+++ util/grub-emu.c
|
||||
@@ -172,6 +172,9 @@ main (int argc, char *argv[])
|
||||
sleep (1);
|
||||
}
|
||||
--- util/i386/pc/grub-install.in.orig 2005-08-07 19:12:52.000000000 +0200
|
||||
+++ util/i386/pc/grub-install.in
|
||||
@@ -21,6 +21,7 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
sbindir=@sbindir@
|
||||
+bindir=@bindir@
|
||||
datadir=@datadir@
|
||||
PACKAGE_NAME=@PACKAGE_NAME@
|
||||
PACKAGE_TARNAME=@PACKAGE_TARNAME@
|
||||
@@ -31,7 +32,7 @@ host_vendor=@host_vendor@
|
||||
pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor}
|
||||
|
||||
+ /* XXX: This is a bit unportable. */
|
||||
+ grub_util_biosdisk_init (args.dev_map);
|
||||
+
|
||||
/* Make sure that there is a root device. */
|
||||
if (! args.root_dev)
|
||||
{
|
||||
@@ -189,9 +192,6 @@ main (int argc, char *argv[])
|
||||
|
||||
grub_env_set ("prefix", rootprefix);
|
||||
|
||||
- /* XXX: This is a bit unportable. */
|
||||
- grub_util_biosdisk_init (args.dev_map);
|
||||
-
|
||||
grub_init_all ();
|
||||
|
||||
/* Start GRUB! */
|
||||
grub_setup=${sbindir}/grub-setup
|
||||
-grub_mkimage=${sbindir}/grub-mkimage
|
||||
+grub_mkimage=${bindir}/grub-mkimage
|
||||
grub_mkdevicemap=${sbindir}/grub-mkdevicemap
|
||||
grub_probefs=${sbindir}/grub-probefs
|
||||
rootdir=
|
||||
|
|
|
@ -1,21 +1,25 @@
|
|||
$NetBSD: patch-ak,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
$NetBSD: patch-ak,v 1.2 2006/01/13 14:16:17 lkundrak Exp $
|
||||
|
||||
--- util/i386/pc/grub-install.in.orig 2005-08-07 19:12:52.000000000 +0200
|
||||
+++ util/i386/pc/grub-install.in
|
||||
@@ -21,6 +21,7 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
sbindir=@sbindir@
|
||||
+bindir=@bindir@
|
||||
datadir=@datadir@
|
||||
PACKAGE_NAME=@PACKAGE_NAME@
|
||||
PACKAGE_TARNAME=@PACKAGE_TARNAME@
|
||||
@@ -31,7 +32,7 @@ host_vendor=@host_vendor@
|
||||
pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor}
|
||||
--- util/misc.c.orig 2005-02-27 22:19:06.000000000 +0100
|
||||
+++ util/misc.c
|
||||
@@ -226,13 +226,15 @@ grub_realloc (void *ptr, grub_size_t siz
|
||||
|
||||
void *
|
||||
grub_memalign (grub_size_t align, grub_size_t size)
|
||||
-{
|
||||
+{
|
||||
void *p;
|
||||
-
|
||||
- p = memalign (align, size);
|
||||
- if (! p)
|
||||
+
|
||||
+ p = malloc (size + align - 1);
|
||||
+ if (p)
|
||||
+ p = (void *)(((int)p/align + 1) * align);
|
||||
+ else
|
||||
grub_util_error ("out of memory");
|
||||
-
|
||||
+
|
||||
return p;
|
||||
}
|
||||
|
||||
grub_setup=${sbindir}/grub-setup
|
||||
-grub_mkimage=${sbindir}/grub-mkimage
|
||||
+grub_mkimage=${bindir}/grub-mkimage
|
||||
grub_mkdevicemap=${sbindir}/grub-mkdevicemap
|
||||
grub_probefs=${sbindir}/grub-probefs
|
||||
rootdir=
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
$NetBSD: patch-al,v 1.1 2005/12/12 17:42:17 lkundrak Exp $
|
||||
|
||||
--- util/misc.c.orig 2005-02-27 22:19:06.000000000 +0100
|
||||
+++ util/misc.c
|
||||
@@ -226,13 +226,15 @@ grub_realloc (void *ptr, grub_size_t siz
|
||||
|
||||
void *
|
||||
grub_memalign (grub_size_t align, grub_size_t size)
|
||||
-{
|
||||
+{
|
||||
void *p;
|
||||
-
|
||||
- p = memalign (align, size);
|
||||
- if (! p)
|
||||
+
|
||||
+ p = malloc (size + align - 1);
|
||||
+ if (p)
|
||||
+ p = (void *)(((int)p/align + 1) * align);
|
||||
+ else
|
||||
grub_util_error ("out of memory");
|
||||
-
|
||||
+
|
||||
return p;
|
||||
}
|
||||
|
Loading…
Reference in a new issue