Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 16 insertions, 83 deletions

diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index d4ec32554..b74263b58 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -9,7 +9,7 @@ PKG_NAME:=		grub-bin
 PKG_VERSION:=		1.97.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		24961a39e63d8ec16d765aad3a301cda
-PKG_DESCR:=		GRUB bootloader
+PKG_DESCR:=		GRUB2 bootloader (binary package)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/
 
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 37d20708a..98abae051 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grub
-PKG_VERSION:=		1.97.1
+PKG_VERSION:=		1.98
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		66fe18cd9318e3d67a34d7b7a8e7b1f6
-PKG_DESCR:=		GRand Unified Bootloader
+PKG_MD5SUM:=		c0bcf60e524739bb64e3a2d4e3732a59
+PKG_DESCR:=		GRUB2 bootloader (source package)
 PKG_SECTION:=		base
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
@@ -19,8 +19,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--disable-grub-emu \
-			--disable-efiemu \
+CONFIGURE_ARGS+=	--disable-efiemu \
 			--disable-grub-mkfont \
 			--disable-grub-fstest
 
diff --git a/package/grub/patches/patch-include_grub_i18n_h b/package/grub/patches/patch-include_grub_i18n_h
new file mode 100644
index 000000000..41151f706
--- /dev/null
+++ b/package/grub/patches/patch-include_grub_i18n_h
@@ -0,0 +1,11 @@
+--- grub-1.98.orig/include/grub/i18n.h	2010-03-06 21:51:37.000000000 +0100
++++ grub-1.98/include/grub/i18n.h	2010-06-26 15:31:22.860562533 +0200
+@@ -25,7 +25,7 @@
+ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
+ 
+ /* NLS can be disabled through the configure --disable-nls option.  */
+-#if ENABLE_NLS
++#if defined(ENABLE_NLS)
+ 
+ # ifdef GRUB_UTIL
+ 
diff --git a/package/grub/patches/patch-include_grub_misc_h b/package/grub/patches/patch-include_grub_misc_h
deleted file mode 100644
index 463e63dac..000000000
--- a/package/grub/patches/patch-include_grub_misc_h
+++ /dev/null
@@ -1,17 +0,0 @@
---- grub-1.97.1.orig/include/grub/misc.h	2009-11-09 16:48:16.000000000 +0100
-+++ grub-1.97.1/include/grub/misc.h	2009-11-29 12:07:10.920475755 +0100
-@@ -74,14 +74,6 @@ grub_strncat (char *dest, const char *sr
-   return dest;
- }
- 
--/* Prototypes for aliases.  */
--#ifndef GRUB_UTIL
--int EXPORT_FUNC(memcmp) (const void *s1, const void *s2, grub_size_t n);
--void *EXPORT_FUNC(memmove) (void *dest, const void *src, grub_size_t n);
--void *EXPORT_FUNC(memcpy) (void *dest, const void *src, grub_size_t n);
--void *EXPORT_FUNC(memset) (void *s, int c, grub_size_t n);
--#endif
--
- int EXPORT_FUNC(grub_memcmp) (const void *s1, const void *s2, grub_size_t n);
- int EXPORT_FUNC(grub_strcmp) (const char *s1, const char *s2);
- int EXPORT_FUNC(grub_strncmp) (const char *s1, const char *s2, grub_size_t n);
diff --git a/package/grub/patches/patch-kern_misc_c b/package/grub/patches/patch-kern_misc_c
deleted file mode 100644
index 16b77a42c..000000000
--- a/package/grub/patches/patch-kern_misc_c
+++ /dev/null
@@ -1,60 +0,0 @@
---- grub-1.97.1.orig/kern/misc.c	2009-11-09 16:48:16.000000000 +0100
-+++ grub-1.97.1/kern/misc.c	2009-11-29 11:48:55.492463135 +0100
-@@ -51,23 +51,6 @@ grub_memmove (void *dest, const void *sr
-   return dest;
- }
- 
--#ifndef APPLE_CC
--void *memmove (void *dest, const void *src, grub_size_t n)
--  __attribute__ ((alias ("grub_memmove")));
--/* GCC emits references to memcpy() for struct copies etc.  */
--void *memcpy (void *dest, const void *src, grub_size_t n)
--  __attribute__ ((alias ("grub_memmove")));
--#else
--void *memcpy (void *dest, const void *src, grub_size_t n)
--{
--	return grub_memmove (dest, src, n);
--}
--void *memmove (void *dest, const void *src, grub_size_t n)
--{
--	return grub_memmove (dest, src, n);
--}
--#endif
--
- char *
- grub_strcpy (char *dest, const char *src)
- {
-@@ -182,10 +165,6 @@ grub_memcmp (const void *s1, const void 
- 
-   return 0;
- }
--#ifndef APPLE_CC
--int memcmp (const void *s1, const void *s2, grub_size_t n)
--  __attribute__ ((alias ("grub_memcmp")));
--#endif
- 
- int
- grub_strcmp (const char *s1, const char *s2)
-@@ -467,10 +446,6 @@ grub_memset (void *s, int c, grub_size_t
- 
-   return s;
- }
--#ifndef APPLE_CC
--void *memset (void *s, int c, grub_size_t n)
--  __attribute__ ((alias ("grub_memset")));
--#endif
- 
- grub_size_t
- grub_strlen (const char *s)
-@@ -1002,11 +977,6 @@ grub_abort (void)
-   grub_exit ();
- }
- 
--#ifndef APPLE_CC
--/* GCC emits references to abort().  */
--void abort (void) __attribute__ ((alias ("grub_abort")));
--#endif
--
- #ifdef NEED_ENABLE_EXECUTE_STACK
- /* Some gcc versions generate a call to this function
-    in trampolines for nested functions.  */