Accepting request 126465 from devel:openSUSE:Factory

update to 2.00 final

OBS-URL: https://build.opensuse.org/request/show/126465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=37
This commit is contained in:
Stephan Kulow 2012-06-29 04:59:42 +00:00 committed by Git OBS Bridge
parent fa1a8de3ed
commit 248261f8d1
19 changed files with 429 additions and 714 deletions

View File

@ -1,16 +0,0 @@
---
include/grub/test.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/include/grub/test.h
+++ b/include/grub/test.h
@@ -49,8 +49,7 @@ int grub_test_run (grub_test_t test);
/* Test `cond' for nonzero; log failure otherwise. */
void grub_test_nonzero (int cond, const char *file,
const char *func, grub_uint32_t line,
- const char *fmt, ...)
- __attribute__ ((format (printf, 5, 6)));
+ const char *fmt, ...);
/* Macro to fill in location details and an optional error message. */
#define grub_test_assert(cond, ...) \

View File

@ -1,36 +0,0 @@
---
grub-core/lib/libgcrypt-grub/cipher/camellia.c | 3 +--
grub-core/lib/libgcrypt/cipher/camellia.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
Index: grub-1.99/grub-core/lib/libgcrypt-grub/cipher/camellia.c
===================================================================
--- grub-1.99.orig/grub-core/lib/libgcrypt-grub/cipher/camellia.c
+++ grub-1.99/grub-core/lib/libgcrypt-grub/cipher/camellia.c
@@ -29,9 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
#include "camellia.h"
+#include "memory.h"
-/* u32 must be 32bit word */
-typedef unsigned int u32;
typedef unsigned char u8;
/* key constants */
Index: grub-1.99/grub-core/lib/libgcrypt/cipher/camellia.c
===================================================================
--- grub-1.99.orig/grub-core/lib/libgcrypt/cipher/camellia.c
+++ grub-1.99/grub-core/lib/libgcrypt/cipher/camellia.c
@@ -26,10 +26,9 @@
#include <string.h>
#include <stdlib.h>
+#include "memory.h"
#include "camellia.h"
-/* u32 must be 32bit word */
-typedef unsigned int u32;
typedef unsigned char u8;
/* key constants */

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
size 2639224

3
grub-2.00.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f4d92ad2353a226412ee395036401714b81f2371494b365dad52f7fbcf87034
size 6006924

View File

@ -1,178 +0,0 @@
Index: grub-1.99/Makefile.am
===================================================================
--- grub-1.99.orig/Makefile.am
+++ grub-1.99/Makefile.am
@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
# Install config.h into platformdir
platform_HEADERS = config.h
-pkglib_DATA += grub-mkconfig_lib
-pkglib_DATA += update-grub_lib
+pkgdata_DATA += grub-mkconfig_lib
+pkgdata_DATA += update-grub_lib
if COND_i386_coreboot
Index: grub-1.99/conf/Makefile.common
===================================================================
--- grub-1.99.orig/conf/Makefile.common
+++ grub-1.99/conf/Makefile.common
@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
man_MANS =
noinst_DATA =
-pkglib_DATA =
+pkgdata_DATA =
bin_SCRIPTS =
sbin_SCRIPTS =
bin_PROGRAMS =
@@ -147,7 +147,7 @@ check_SCRIPTS =
grubconf_DATA =
check_PROGRAMS =
noinst_SCRIPTS =
-pkglib_SCRIPTS =
+pkgdata_SCRIPTS =
noinst_PROGRAMS =
grubconf_SCRIPTS =
noinst_LIBRARIES =
Index: grub-1.99/util/grub-mkconfig.in
===================================================================
--- grub-1.99.orig/util/grub-mkconfig.in
+++ grub-1.99/util/grub-mkconfig.in
@@ -95,7 +95,7 @@ do
esac
done
-. ${libdir}/grub/grub-mkconfig_lib
+. ${datadir}/grub/grub-mkconfig_lib
if [ "x$EUID" = "x" ] ; then
EUID=`id -u`
Index: grub-1.99/util/grub.d/00_header.in
===================================================================
--- grub-1.99.orig/util/grub.d/00_header.in
+++ grub-1.99/util/grub.d/00_header.in
@@ -22,10 +22,11 @@ transform="@program_transform_name@"
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
+datadir=@datadir@
locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
grub_lang=`echo $LANG | cut -d . -f 1`
-. ${libdir}/grub/grub-mkconfig_lib
+. ${datadir}/grub/grub-mkconfig_lib
# Do this as early as possible, since other commands might depend on it.
# (e.g. the `loadfont' command might need lvm or raid modules)
Index: grub-1.99/util/grub.d/10_hurd.in
===================================================================
--- grub-1.99.orig/util/grub.d/10_hurd.in
+++ grub-1.99/util/grub.d/10_hurd.in
@@ -20,7 +20,8 @@ set -e
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+datadir=@datadir@
+. ${datadir}/grub/grub-mkconfig_lib
CLASS="--class gnu --class os"
Index: grub-1.99/util/grub.d/10_kfreebsd.in
===================================================================
--- grub-1.99.orig/util/grub.d/10_kfreebsd.in
+++ grub-1.99/util/grub.d/10_kfreebsd.in
@@ -21,7 +21,8 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+datadir=@datadir@
+. ${datadir}/grub/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@
Index: grub-1.99/util/grub.d/10_linux.in
===================================================================
--- grub-1.99.orig/util/grub.d/10_linux.in
+++ grub-1.99/util/grub.d/10_linux.in
@@ -21,7 +21,8 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+datadir=@datadir@
+. ${datadir}/grub/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@
Index: grub-1.99/util/grub.d/10_netbsd.in
===================================================================
--- grub-1.99.orig/util/grub.d/10_netbsd.in
+++ grub-1.99/util/grub.d/10_netbsd.in
@@ -21,7 +21,8 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+datadir=@datadir@
+. ${datadir}/grub/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@
Index: grub-1.99/util/grub.d/10_windows.in
===================================================================
--- grub-1.99.orig/util/grub.d/10_windows.in
+++ grub-1.99/util/grub.d/10_windows.in
@@ -20,7 +20,8 @@ set -e
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+datadir=@datadir@
+. ${datadir}/grub/grub-mkconfig_lib
case "`uname 2>/dev/null`" in
CYGWIN*) ;;
Index: grub-1.99/util/grub.d/20_linux_xen.in
===================================================================
--- grub-1.99.orig/util/grub.d/20_linux_xen.in
+++ grub-1.99/util/grub.d/20_linux_xen.in
@@ -21,7 +21,8 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+datadir=@datadir@
+. ${datadir}/grub/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@
Index: grub-1.99/util/grub.d/30_os-prober.in
===================================================================
--- grub-1.99.orig/util/grub.d/30_os-prober.in
+++ grub-1.99/util/grub.d/30_os-prober.in
@@ -20,8 +20,9 @@ set -e
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
+datadir=@datadir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${datadir}/grub/grub-mkconfig_lib
if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
exit 0
Index: grub-1.99/util/update-grub_lib.in
===================================================================
--- grub-1.99.orig/util/update-grub_lib.in
+++ grub-1.99/util/update-grub_lib.in
@@ -18,6 +18,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-. ${libdir}/grub/grub-mkconfig_lib
+. ${datadir}/grub/grub-mkconfig_lib
grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"

View File

@ -0,0 +1,26 @@
Suse has its fonts in /usr/share/fonts/uni, so use it.
---
--- a/configure.ac 2012-06-06 10:36:33 +0000
+++ b/configure.ac 2012-06-24 13:24:26 +0000
@@ -242,7 +242,7 @@
FONT_SOURCE=
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do
+ for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do
if test -f "$dir/unifont.$ext"; then
FONT_SOURCE="$dir/unifont.$ext"
break 2
--- a/configure
+++ b/configure
@@ -4126,7 +4126,7 @@ fi
FONT_SOURCE=
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do
+ for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do
if test -f "$dir/unifont.$ext"; then
FONT_SOURCE="$dir/unifont.$ext"
break 2

View File

@ -1,30 +0,0 @@
Index: grub-1.99/grub-core/commands/usbtest.c
===================================================================
--- grub-1.99.orig/grub-core/commands/usbtest.c
+++ grub-1.99/grub-core/commands/usbtest.c
@@ -111,7 +111,7 @@ grub_usb_get_string (grub_usb_device_t d
static void
usb_print_str (const char *description, grub_usb_device_t dev, int idx)
{
- char *name;
+ char *name = NULL;
grub_usb_err_t err;
/* XXX: LANGID */
Index: grub-1.99/conf/Makefile.common
===================================================================
--- grub-1.99.orig/conf/Makefile.common
+++ grub-1.99/conf/Makefile.common
@@ -11,10 +11,10 @@ if COND_i386_pc
CFLAGS_PLATFORM += -mrtd -mregparm=3
endif
if COND_i386_efi
- LDFLAGS_PLATFORM = -melf_i386
+ LDFLAGS_PLATFORM = -Wl,-melf_i386
endif
if COND_x86_64_efi
- LDFLAGS_PLATFORM = -melf_x86_64
+ LDFLAGS_PLATFORM = -Wl,-melf_x86_64
endif
if COND_i386_qemu
CFLAGS_PLATFORM += -mrtd -mregparm=3

View File

@ -1,3 +1,7 @@
References: bnc#750897
---
Index: grub-1.99/util/grub-install.in
===================================================================
--- grub-1.99.orig/util/grub-install.in
@ -10,14 +14,14 @@ Index: grub-1.99/util/grub-install.in
+ setup_skip_fs_probe="--skip-fs-probe" ;;
+
-*)
echo "Unrecognized option \`$option'" 1>&2
gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
usage
@@ -581,7 +584,7 @@ fi
# Perform the platform-dependent install
if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
# Perform the grub_modinfo_platform-dependent install
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ] ; then
# Now perform the installation.
- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}" \
+ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}" \
- "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \
+ "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \
--device-map="${device_map}" "${install_device}" || exit 1
elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
if [ x"$update_nvram" = xyes ]; then
elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ]; then

View File

@ -1,9 +1,12 @@
References: bnc#750897
---
Index: grub-1.99/grub-core/partmap/msdos.c
===================================================================
--- grub-1.99.orig/grub-core/partmap/msdos.c
+++ grub-1.99/grub-core/partmap/msdos.c
@@ -107,11 +107,15 @@ grub_partition_msdos_iterate (grub_disk_
return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr");
(unsigned long long) p.len);
/* If this partition is a normal one, call the hook. */
- if (! grub_msdos_partition_is_empty (e->type)

View File

@ -13,10 +13,10 @@ Index: grub-1.99/util/grub.d/10_linux.in
@@ -116,7 +116,7 @@ EOF
message="$(gettext_printf "Loading Linux %s ..." ${version})"
cat << EOF
sed "s/^/$submenu_indentation/" << EOF
echo '$message'
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ${args}
EOF
if test -n "${initrd}" ; then
message="$(gettext_printf "Loading initial ramdisk ...")"
# TRANSLATORS: ramdisk isn't identifier. Should be translated.

View File

@ -1,316 +0,0 @@
Index: grub-1.99/grub-core/kern/emu/hostdisk.c
===================================================================
--- grub-1.99.orig/grub-core/kern/emu/hostdisk.c
+++ grub-1.99/grub-core/kern/emu/hostdisk.c
@@ -1150,10 +1150,14 @@ make_device_name (int drive, int dos_par
}
static char *
-convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
+convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
+ int *is_part)
{
#if defined(__linux__)
char *path = xmalloc (PATH_MAX);
+
+ *is_part = 0;
+
if (! realpath (os_dev, path))
return NULL;
@@ -1166,7 +1170,10 @@ convert_system_partition_to_system_disk
{
p = strstr (p, "part");
if (p)
- strcpy (p, "disc");
+ {
+ *is_part = 1;
+ strcpy (p, "disc");
+ }
return path;
}
@@ -1176,7 +1183,10 @@ convert_system_partition_to_system_disk
{
p = strstr (p, "part");
if (p)
- strcpy (p, "disc");
+ {
+ *is_part = 1;
+ strcpy (p, "disc");
+ }
return path;
}
@@ -1187,7 +1197,10 @@ convert_system_partition_to_system_disk
/* /dev/rd/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1198,7 +1211,10 @@ convert_system_partition_to_system_disk
/* /dev/rd/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1208,7 +1224,10 @@ convert_system_partition_to_system_disk
/* /dev/cciss/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1219,7 +1238,10 @@ convert_system_partition_to_system_disk
/* /dev/ida/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1228,6 +1250,8 @@ convert_system_partition_to_system_disk
if (strncmp ("i2o/hd", p, sizeof ("i2o/hd") - 1) == 0)
{
/* /dev/i2o/hd[a-z]([0-9]+)? */
+ if (p[sizeof ("i2o/hda") - 1])
+ *is_part = 1;
p[sizeof ("i2o/hda") - 1] = '\0';
return path;
}
@@ -1238,7 +1262,10 @@ convert_system_partition_to_system_disk
/* /dev/mmcblk[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1249,6 +1276,8 @@ convert_system_partition_to_system_disk
char *ptr = p + 2;
while (*ptr >= '0' && *ptr <= '9')
ptr++;
+ if (*ptr)
+ *is_part = 1;
*ptr = 0;
return path;
}
@@ -1258,6 +1287,8 @@ convert_system_partition_to_system_disk
&& p[5] >= 'a' && p[5] <= 'z')
{
/* /dev/vdisk[a-z][0-9]* */
+ if (p[6])
+ *is_part = 1;
p[6] = '\0';
return path;
}
@@ -1269,6 +1300,8 @@ convert_system_partition_to_system_disk
char *pp = p + 2;
while (*pp >= 'a' && *pp <= 'z')
pp++;
+ if (*pp)
+ *is_part = 1;
/* /dev/[hsv]d[a-z]+[0-9]* */
*pp = '\0';
return path;
@@ -1280,16 +1313,16 @@ convert_system_partition_to_system_disk
char *pp = p + 3;
while (*pp >= 'a' && *pp <= 'z')
pp++;
+ if (*pp)
+ *is_part = 1;
/* /dev/xvd[a-z]+[0-9]* */
*pp = '\0';
return path;
}
#ifdef HAVE_DEVICE_MAPPER
- /* If this is a DM-RAID device.
- Compare os_dev rather than path here, since nodes under
- /dev/mapper/ are often symlinks. */
- if ((strncmp ("/dev/mapper/", os_dev, 12) == 0))
+ if ((strncmp ("/dev/mapper/", path, sizeof ("/dev/mapper/") - 1) == 0)
+ || (strncmp ("/dev/dm-", path, sizeof ("/dev/dm-") - 1) == 0))
{
struct dm_tree *tree;
uint32_t maj, min;
@@ -1388,14 +1421,21 @@ devmapper_out:
{
char *p = strchr (path + 7, 's');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
}
return path;
#elif defined(__CYGWIN__)
char *path = xstrdup (os_dev);
- if (strncmp ("/dev/sd", path, 7) == 0 && 'a' <= path[7] && path[7] <= 'z')
- path[8] = 0;
+ if (strncmp ("/dev/sd", path, 7) == 0 && 'a' <= path[7] && path[7] <= 'z'
+ && path[8])
+ {
+ *is_part = 1;
+ path[8] = 0;
+ }
return path;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -1404,6 +1444,8 @@ devmapper_out:
return xstrdup (os_dev);
follow_geom_up (os_dev + sizeof ("/dev/") - 1, NULL, &out);
+ if (grub_strcmp (os_dev + sizeof ("/dev/") - 1, out) != 0)
+ *is_part = 1;
out2 = xasprintf ("/dev/%s", out);
free (out);
@@ -1418,7 +1460,10 @@ devmapper_out:
{
p = strpbrk (p, "sp");
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
break;
}
}
@@ -1445,7 +1490,11 @@ devmapper_out:
rawpart = getrawpartition();
# endif /* HAVE_GETRAWPARTITION */
if (rawpart >= 0)
- *p = 'a' + rawpart;
+ {
+ if (*p != 'a' + rawpart)
+ *is_part = 1;
+ *p = 'a' + rawpart;
+ }
}
}
}
@@ -1457,67 +1506,15 @@ devmapper_out:
#endif
}
-#if defined(__linux__) || defined(__CYGWIN__)
-static int
-device_is_wholedisk (const char *os_dev)
-{
- int len = strlen (os_dev);
-
- if (os_dev[len - 1] < '0' || os_dev[len - 1] > '9')
- return 1;
- return 0;
-}
-#endif
-
-#if defined(__NetBSD__)
-/* Try to determine whether a given device name corresponds to a whole disk.
- This function should give in most cases a definite answer, but it may
- actually give an approximate one in the following sense: if the return
- value is 0 then the device name does not correspond to a whole disk. */
-static int
-device_is_wholedisk (const char *os_dev)
-{
- int len = strlen (os_dev);
- int rawpart = -1;
-
-# ifdef HAVE_GETRAWPARTITION
- rawpart = getrawpartition();
-# endif /* HAVE_GETRAWPARTITION */
- if (rawpart < 0)
- return 1;
- return (os_dev[len - 1] == ('a' + rawpart));
-}
-#endif /* defined(__NetBSD__) */
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-static int
-device_is_wholedisk (const char *os_dev)
-{
- const char *p;
-
- if (strncmp (os_dev, "/dev/", sizeof ("/dev/") - 1) != 0)
- return 0;
-
- for (p = os_dev + sizeof ("/dev/") - 1; *p; ++p)
- if (grub_isdigit (*p))
- {
- if (strchr (p, 's'))
- return 0;
- break;
- }
-
- return 1;
-}
-#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
-
static int
find_system_device (const char *os_dev, struct stat *st, int convert, int add)
{
unsigned int i;
char *os_disk;
+ int is_part;
if (convert)
- os_disk = convert_system_partition_to_system_disk (os_dev, st);
+ os_disk = convert_system_partition_to_system_disk (os_dev, st, &is_part);
else
os_disk = xstrdup (os_dev);
if (! os_disk)
@@ -1560,6 +1557,7 @@ grub_util_biosdisk_get_grub_dev (const c
{
struct stat st;
int drive;
+ int is_part;
if (stat (os_dev, &st) < 0)
{
@@ -1578,7 +1576,7 @@ grub_util_biosdisk_get_grub_dev (const c
}
if (grub_strcmp (os_dev,
- convert_system_partition_to_system_disk (os_dev, &st)) == 0)
+ convert_system_partition_to_system_disk (os_dev, &st, &is_part)) == 0)
return make_device_name (drive, -1, -1);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
@@ -1645,7 +1643,7 @@ grub_util_biosdisk_get_grub_dev (const c
grub_util_info ("%s starts from %lu", os_dev, start);
- if (start == 0 && device_is_wholedisk (os_dev))
+ if (start == 0 && !is_part)
return name;
grub_util_info ("opening the device %s", name);

View File

@ -1,24 +0,0 @@
From 8b424dd42b64453e50a49a4c6fc455584f931b46 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <pjones@fedoraproject.org>
Date: Thu, 23 Jun 2011 00:08:03 +0400
Subject: [PATCH] Workaround for 'variable set but not used' issue
Signed-off-by: Fedora Ninjas <pjones@fedoraproject.org>
---
grub-core/lib/relocator.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Index: grub-1.99/grub-core/lib/relocator.c
===================================================================
--- grub-1.99.orig/grub-core/lib/relocator.c
+++ grub-1.99/grub-core/lib/relocator.c
@@ -1021,6 +1021,9 @@ malloc_in_range (struct grub_relocator *
= ALIGN_UP (alloc_end,
GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+ grub_dprintf ("relocator", "requesting %lx-%lx\n",
+ (unsigned long) fstart,
+ (unsigned long) fend);
#if GRUB_RELOCATOR_HAVE_LEFTOVERS
{
struct grub_relocator_fw_leftover *lo1 = NULL;

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Jun 28 09:33:26 CEST 2012 - jslaby@suse.de
- update to 2.0 final
* see ChangeLog for changes
-------------------------------------------------------------------
Mon Jun 25 11:10:27 UTC 2012 - adrian@suse.de
- enable xz/lzma support for image file generation
-------------------------------------------------------------------
Sun Jun 24 18:10:27 UTC 2012 - jslaby@suse.de
- update to 2.0 beta6, a snapshot from today
* see ChangeLog for changes
-------------------------------------------------------------------
Fri Jun 22 08:50:12 UTC 2012 - mchang@suse.com

View File

@ -33,17 +33,18 @@ BuildRequires: libncurses5
BuildRequires: libusb-1_0-devel
BuildRequires: ncurses-devel
%endif
BuildRequires: autogen
BuildRequires: automake
BuildRequires: bison
BuildRequires: device-mapper-devel
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: fuse-devel
BuildRequires: gnu-unifont
BuildRequires: lzma
BuildRequires: ruby
BuildRequires: xz
BuildRequires: autogen
BuildRequires: python
BuildRequires: ruby
BuildRequires: xz-devel
%if 0%{?suse_version} == 1210
BuildRequires: guile
%endif
@ -61,30 +62,27 @@ BuildRequires: guile
%global efi %{ix86} x86_64 ia64
%endif
Version: 1.99
Version: 2.00
Release: 0
Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0+
Group: System/Boot
Url: http://www.gnu.org/software/grub/
Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
%define rev 20120622
Source0: grub-%{version}.tar.xz
Source1: 90_persistent
Source2: grub.default
Source3: README.openSUSE
Source4: grub2.rpmlintrc
# rsync -Lrtvz translationproject.org::tp/latest/grub/ po
Source5: translations-20111024.tar.bz2
Patch0: gcc46-fixes.patch
Source5: translations-20120622.tar.xz
Patch0: grub2-correct-font-path.patch
Patch1: rename-grub-info-file-to-grub2.patch
Patch2: grub2-linux.patch
Patch3: gccwarn.patch
Patch3: use-grub2-as-a-package-name.patch
Patch4: grub2-linux-submenu.patch
Patch5: grub2-unused.patch
Patch6: grub2-iterate-and-hook-for-extended-partition.patch
Patch7: grub2-install-opt-skip-fs-probe.patch
Patch8: grub2-gcc47.patch
Patch9: os-prober_osx.patch
Patch10: grub2-probe-disk-mountby.patch
Patch11: grub2-automake-1-11-2.patch
PreReq: perl-Bootloader
Requires: gettext-runtime
Requires: os-prober
@ -127,34 +125,24 @@ provides support for EFI systems.
%endif
%prep
# We create (if we build for efi) two copies of the sources
# in the Builddir
%setup -T -c -n grub-%{version}
%setup -D -T -q -n grub-%{version} -a 0
(cd grub-%{version};tar xaf %{SOURCE5})
(cd grub-%{version}/po && ls *.po | cut -d. -f1 | xargs) >grub-%{version}/po/LINGUAS
sed 's,@setfilename grub.info,@setfilename grub2.info,' grub-%{version}/docs/grub.texi >grub-%{version}/docs/grub2.texi
sed -i 's,grub.texi,grub2.texi,' grub-%{version}/docs/Makefile.am
## fix unifont location so grub-mkfont can create *.pf2 files
sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/uni|g' grub-%{version}/configure.ac
# We create (if we build for efi) two copies of the sources in the Builddir
%setup -q -T -c -n grub-%{version} -a 0 -a 5
cp -r po grub-%{version}/
cd grub-%{version}
(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
#%%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
cd ..
# README.openSUSE
cp %{SOURCE3} grub-%{version}/
%ifarch %{efi}
cp -a grub-%{version} grub-efi-%{version}
(cp -a grub-%{version} grub-efi-%{version})
%endif
%build
@ -171,7 +159,7 @@ export CFLAGS CXXFLAGS FFLAGS
--target=%{_target_platform} \
--with-platform=efi \
--program-transform-name=s,grub,%{name}-efi,
make %{?_smp_mflags}
make %{?_smp_mflags} pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi
%ifarch %{ix86}
%define grubefiarch i386-efi
%else
@ -182,6 +170,7 @@ make %{?_smp_mflags}
loadbios reboot halt search font gfxterm
cd ..
%endif
cd grub-%{version}
./autogen.sh
@ -210,7 +199,7 @@ make %{?_smp_mflags}
%install
%ifarch %{efi}
cd grub-efi-%{version}
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi install
# Ghost config file
install -d $RPM_BUILD_ROOT/boot/%{name}-efi
@ -223,7 +212,6 @@ rm $RPM_BUILD_ROOT/%{_libdir}/%{name}-efi/*/*.h
rm $RPM_BUILD_ROOT%{_datadir}/%{name}-efi/*.h
cd ..
%endif
cd grub-%{version}
@ -242,7 +230,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h
# Defaults
install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
%find_lang grub
%find_lang %{name}
%fdupes %buildroot%{_bindir}
%post
@ -250,12 +238,6 @@ install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
mkdir -p /boot/%{name}/ 2>/dev/null || true
# Create device.map or reuse one from GRUB Legacy
if [ ! -e /boot/%{name}/device.map ] ; then
cp -u /boot/grub/device.map /boot/%{name}/device.map 2>/dev/null ||
%{name}-mkdevicemap
fi
if [ -e /boot/%{name}/device.map ]; then
# Determine the partition with /boot
BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}'))
# Generate core.img, but don't let it be installed in boot sector
@ -266,7 +248,6 @@ if [ -e /boot/%{name}/device.map ]; then
# Add core.img as multiboot kernel to GRUB Legacy menu
/sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true
/sbin/update-bootloader --refresh || true
fi
%ifarch %{efi}
@ -300,29 +281,57 @@ if [ $1 = 0 ]; then
fi
%endif
%files -f grub-%{version}/grub.lang
%files -f grub-%{version}/%{name}.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}
%{_sbindir}/%{name}-*
%{_datadir}/%{name}
%{_datadir}/grub
%ifarch %{efi}
%exclude %{_sbindir}/grub2-efi-*
%endif
%{_bindir}/%{name}-*
%ifarch %{efi}
%exclude %{_bindir}/%{name}-efi-*
%endif
%doc grub-%{version}/COPYING grub-%{version}/NEWS grub-%{version}/README
%doc grub-%{version}/THANKS grub-%{version}/TODO grub-%{version}/ChangeLog
%doc grub-%{version}/README.openSUSE
%dir /boot/%{name}
%ghost /boot/%{name}/grub.cfg
%{_sysconfdir}/bash_completion.d/grub
%config(noreplace) %{_sysconfdir}/default/grub
%dir %{_sysconfdir}/grub.d
%{_sysconfdir}/grub.d/README
%config %{_sysconfdir}/grub.d/??_*
%dir /boot/%{name}
%ghost /boot/%{name}/grub.cfg
%doc grub-%{version}/COPYING grub-%{version}/NEWS
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
%{_sbindir}/%{name}-bios-setup
%{_sbindir}/%{name}-install
%{_sbindir}/%{name}-mkconfig
%{_sbindir}/%{name}-mknetdir
%{_sbindir}/%{name}-ofpathname
%{_sbindir}/%{name}-probe
%{_sbindir}/%{name}-reboot
%{_sbindir}/%{name}-set-default
%{_sbindir}/%{name}-sparc64-setup
%{_bindir}/%{name}-editenv
%{_bindir}/%{name}-fstest
%{_bindir}/%{name}-kbdcomp
%{_bindir}/%{name}-menulst2cfg
%{_bindir}/%{name}-mkfont
%{_bindir}/%{name}-mkimage
%{_bindir}/%{name}-mklayout
%{_bindir}/%{name}-mkpasswd-pbkdf2
%{_bindir}/%{name}-mkrelpath
%{_bindir}/%{name}-mkrescue
%{_bindir}/%{name}-mkstandalone
%{_bindir}/%{name}-mount
%{_bindir}/%{name}-script-check
%dir %{_libdir}/%{name}/
%dir %{_libdir}/%{name}/*/
%{_libdir}/%{name}/*/*.image
%{_libdir}/%{name}/*/*.img
%{_libdir}/%{name}/*/*.lst
%{_libdir}/%{name}/*/*.mod
%{_libdir}/%{name}/*/*.module
%ifarch x86_64
%{_libdir}/%{name}/*/efiemu*.o
%endif
%{_libdir}/%{name}/*/gdb_grub2
%{_libdir}/%{name}/*/gmodule.pl
%{_libdir}/%{name}/*/kernel.exec
%{_libdir}/%{name}/*/modinfo.sh
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.pf2
%{_datadir}/%{name}/grub-mkconfig_lib
%{_infodir}/grub-dev.info*
%{_infodir}/%{name}.info*
@ -332,41 +341,46 @@ fi
%defattr(-,root,root,-)
%dir /boot/efi
%dir /boot/efi/EFI
%attr(0755,root,root)/boot/efi/EFI/opensuse
%{_libdir}/grub2-efi
%{_sbindir}/grub2-efi-mkconfig
%{_sbindir}/grub2-efi-mkdevicemap
%{_sbindir}/grub2-efi-mknetdir
%dir /boot/efi/EFI/opensuse
%attr(0755,root,root)/boot/efi/EFI/opensuse/grub.efi
%dir /boot/grub2-efi
%ghost /boot/grub2-efi/grub.cfg
%{_sbindir}/grub2-efi-bios-setup
%{_sbindir}/grub2-efi-install
%{_sbindir}/grub2-efi-mkconfig
%{_sbindir}/grub2-efi-mknetdir
%{_sbindir}/grub2-efi-ofpathname
%{_sbindir}/grub2-efi-probe
%{_sbindir}/grub2-efi-reboot
%{_sbindir}/grub2-efi-set-default
#%%{_sbindir}/grub2-efi-setup
%{_bindir}/grub2-efi-bin2h
%{_sbindir}/grub2-efi-sparc64-setup
%{_bindir}/grub2-efi-editenv
%{_bindir}/grub2-efi-fstest
%{_bindir}/grub2-efi-kbdcomp
%{_bindir}/grub2-efi-menulst2cfg
# %%{_bindir}/grub2-efi-mkelfimage
%{_bindir}/grub2-efi-mkstandalone
%{_bindir}/grub2-efi-mkfont
%{_bindir}/grub2-efi-mklayout
%{_bindir}/grub2-efi-mkimage
# %%{_bindir}/grub2-efi-mkisofs
%{_bindir}/grub2-efi-mkpasswd-pbkdf2
%{_bindir}/grub2-efi-mkrelpath
%ifnarch %{sparc} ppc ppc64
%{_bindir}/grub2-efi-mkrescue
%endif
%ifarch %{sparc} ppc ppc64
%{_sbindir}/grub2-efi-ofpathname
%endif
%{_bindir}/grub2-efi-mount
%{_bindir}/grub2-efi-script-check
%dir /boot/grub2-efi
%ghost /boot/grub2-efi/grub.cfg
%doc grub-%{version}/COPYING grub-%{version}/NEWS
%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
%dir %{_libdir}/%{name}-efi/
%dir %{_libdir}/%{name}-efi/*/
%{_libdir}/%{name}-efi/*/*.img
%{_libdir}/%{name}-efi/*/*.lst
%{_libdir}/%{name}-efi/*/*.mod
%{_libdir}/%{name}-efi/*/*.module
%{_libdir}/%{name}-efi/*/gdb_grub2-efi
%{_libdir}/%{name}-efi/*/gmodule.pl
%{_libdir}/%{name}-efi/*/kernel.exec
%{_libdir}/%{name}-efi/*/modinfo.sh
%dir %{_datadir}/%{name}-efi
%{_datadir}/%{name}-efi/grub-mkconfig_lib
%{_datadir}/%{name}-efi/*.pf2
%endif

View File

@ -1,13 +0,0 @@
Index: grub-1.99/util/grub.d/30_os-prober.in
===================================================================
--- grub-1.99.orig/util/grub.d/30_os-prober.in
+++ grub-1.99/util/grub.d/30_os-prober.in
@@ -168,7 +168,7 @@
done
;;
macosx)
- OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
+ OSXUUID="`${grub_probe} --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
osx_entry xnu_kernel 32
osx_entry xnu_kernel64 64
;;

View File

@ -0,0 +1,136 @@
From 031abf80020b2fa75850d6e09f4489b687a5cb19 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sun, 24 Jun 2012 15:40:40 +0200
Subject: [PATCH] rename grub info file to grub2
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
docs/Makefile.am | 2 +-
docs/Makefile.in | 46 ++++++++++++++++++++--------------------
docs/{grub.texi => grub2.texi} | 2 +-
3 files changed, 25 insertions(+), 25 deletions(-)
rename docs/{grub.texi => grub2.texi} (99%)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 93eb396..4143042 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = subdir-objects
# AM_MAKEINFOFLAGS = --no-split --no-validate
-info_TEXINFOS = grub.texi grub-dev.texi
+info_TEXINFOS = grub2.texi grub-dev.texi
grub_TEXINFOS = fdl.texi
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 217ea7e..49dc477 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -35,8 +35,8 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = docs
-DIST_COMMON = $(grub_TEXINFOS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
$(srcdir)/version-dev.texi $(srcdir)/version.texi mdate-sh \
texinfo.tex
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -91,14 +91,14 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
-INFO_DEPS = $(srcdir)/grub.info $(srcdir)/grub-dev.info
+INFO_DEPS = $(srcdir)/grub2.info $(srcdir)/grub-dev.info
TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
-DVIS = grub.dvi grub-dev.dvi
-PDFS = grub.pdf grub-dev.pdf
-PSS = grub.ps grub-dev.ps
-HTMLS = grub.html grub-dev.html
-TEXINFOS = grub.texi grub-dev.texi
+DVIS = grub2.dvi grub-dev.dvi
+PDFS = grub2.pdf grub-dev.pdf
+PSS = grub2.ps grub-dev.ps
+HTMLS = grub2.html grub-dev.html
+TEXINFOS = grub2.texi grub-dev.texi
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
@@ -767,7 +767,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = subdir-objects
# AM_MAKEINFOFLAGS = --no-split --no-validate
-info_TEXINFOS = grub.texi grub-dev.texi
+info_TEXINFOS = grub2.texi grub-dev.texi
grub_TEXINFOS = fdl.texi
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
all: all-am
@@ -850,14 +850,14 @@ $(am__aclocal_m4_deps):
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
exit 1; \
fi
-$(srcdir)/grub.info: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
-grub.dvi: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
-grub.pdf: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
-grub.html: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
+$(srcdir)/grub2.info: grub2.texi $(srcdir)/version.texi
+grub2.dvi: grub2.texi $(srcdir)/version.texi
+grub2.pdf: grub2.texi $(srcdir)/version.texi
+grub2.html: grub2.texi $(srcdir)/version.texi
$(srcdir)/version.texi: $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure
- @(dir=.; test -f ./grub.texi || dir=$(srcdir); \
- set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub.texi`; \
+$(srcdir)/stamp-vti: grub2.texi $(top_srcdir)/configure
+ @(dir=.; test -f ./grub2.texi || dir=$(srcdir); \
+ set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub2.texi`; \
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
@@ -979,16 +979,16 @@ dist-info: $(INFO_DEPS)
done
mostlyclean-aminfo:
- -rm -rf grub.aux grub.cp grub.cps grub.fn grub.ky grub.log grub.pg grub.tmp \
- grub.toc grub.tp grub.vr grub-dev.aux grub-dev.cp \
- grub-dev.cps grub-dev.fn grub-dev.ky grub-dev.log \
- grub-dev.pg grub-dev.tmp grub-dev.toc grub-dev.tp \
- grub-dev.vr
+ -rm -rf grub2.aux grub2.cp grub2.cps grub2.fn grub2.ky grub2.log grub2.pg \
+ grub2.tmp grub2.toc grub2.tp grub2.vr grub-dev.aux \
+ grub-dev.cp grub-dev.cps grub-dev.fn grub-dev.ky \
+ grub-dev.log grub-dev.pg grub-dev.tmp grub-dev.toc \
+ grub-dev.tp grub-dev.vr
clean-aminfo:
- -test -z "grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \
+ -test -z "grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \
grub-dev.ps grub-dev.html" \
- || rm -rf grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \
+ || rm -rf grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \
grub-dev.ps grub-dev.html
maintainer-clean-aminfo:
diff --git a/docs/grub.texi b/docs/grub2.texi
similarity index 99%
rename from docs/grub.texi
rename to docs/grub2.texi
index 26944ac..fb7fb0e 100644
--- a/docs/grub.texi
+++ b/docs/grub2.texi
@@ -1,7 +1,7 @@
\input texinfo
@c -*-texinfo-*-
@c %**start of header
-@setfilename grub.info
+@setfilename grub2.info
@include version.texi
@settitle GNU GRUB Manual @value{VERSION}
@c Unify all our little indices for now.
--
1.7.10.4

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df78da4585f0fd7a1f4a8187a3d662684914e25459df337b68074c0e7178a541
size 174272

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e51cd0cd63c46cf7cc4adfa9a0bfc9b4515ccb91d2bbc17d90b47873215a37a9
size 308552

View File

@ -0,0 +1,128 @@
From 3729b131ef1dcaa043242e8074418249695d381b Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sun, 24 Jun 2012 20:51:52 +0200
Subject: [PATCH] use grub2 as a package name
This will ease all of the renaming of directories and all the pkgdata
hacks.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
configure | 24 ++++++++++++------------
configure.ac | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 50e6bf6..544c16a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GRUB 2.00.
+# Generated by GNU Autoconf 2.68 for GRUB2 2.00.
#
# Report bugs to <bug-grub@gnu.org>.
#
@@ -558,10 +558,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='GRUB'
-PACKAGE_TARNAME='grub'
+PACKAGE_NAME='GRUB2'
+PACKAGE_TARNAME='grub2'
PACKAGE_VERSION='2.00'
-PACKAGE_STRING='GRUB 2.00'
+PACKAGE_STRING='GRUB2 2.00'
PACKAGE_BUGREPORT='bug-grub@gnu.org'
PACKAGE_URL=''
@@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GRUB 2.00 to adapt to many kinds of systems.
+\`configure' configures GRUB2 2.00 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1952,7 +1952,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/grub]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/grub2]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1975,7 +1975,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GRUB 2.00:";;
+ short | recursive ) echo "Configuration of GRUB2 2.00:";;
esac
cat <<\_ACEOF
@@ -2108,7 +2108,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GRUB configure 2.00
+GRUB2 configure 2.00
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GRUB $as_me 2.00, which was
+It was created by GRUB2 $as_me 2.00, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3789,7 +3789,7 @@ fi
# Define the identity of the package.
- PACKAGE='grub'
+ PACKAGE='grub2'
VERSION='2.00'
@@ -23344,7 +23344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GRUB $as_me 2.00, which was
+This file was extended by GRUB2 $as_me 2.00, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23414,7 +23414,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GRUB config.status 2.00
+GRUB2 config.status 2.00
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 1b5132c..5ea7ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_"
dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
dnl type.
-AC_INIT([GRUB],[2.00],[bug-grub@gnu.org])
+AC_INIT([GRUB2],[2.00],[bug-grub@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
--
1.7.10.4