jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-07 02:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

grub: bump to 0.97-67

Browse Source 
Bump to a more recent version of the Debian patches for grub legacy,
that fix an incorrect build with gcc 4.6.

Fixes #6092 and #2629.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2013-12-04 22:11:00 +01:00 committed by Peter Korsgaard
parent 4da14cd16b
commit a79ea8a60b
4 changed files with 476 additions and 2888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot/grub/grub.200-fix_mbr_handling.patch
View File

@ -1,8 +1,10 @@
--- grub-0.97.oorig/stage2/disk_io.c 2004-05-23 18:35:24.000000000 +0200 Index: b/stage2/disk_io.c
+++ grub-0.97/stage2/disk_io.c 2006-03-12 14:11:51.000000000 +0100 ===================================================================
@@ -365,7 +365,7 @@ rawwrite (int drive, int sector, char *b --- a/stage2/disk_io.c
+++ b/stage2/disk_io.c
@@ -365,7 +365,7 @@
int int
devwrite (int sector, int sector_count, char *buf) devwrite (unsigned int sector, int sector_count, char *buf)
{ {
-#if defined(GRUB_UTIL) && defined(__linux__) -#if defined(GRUB_UTIL) && defined(__linux__)
+#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV) +#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV)

14
boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
View File

@ -1,6 +1,7 @@
diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c Index: b/grub/asmstub.c
--- grub-0.97.orig/grub/asmstub.c 2006-11-29 20:36:20.000000000 +0100 ===================================================================
+++ grub-0.97/grub/asmstub.c 2006-11-29 21:26:16.000000000 +0100 --- a/grub/asmstub.c
+++ b/grub/asmstub.c
@@ -18,10 +18,13 @@ @@ -18,10 +18,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
@ -15,9 +16,10 @@ diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c
/* Simulator entry point. */ /* Simulator entry point. */
int grub_stage2 (void); int grub_stage2 (void);
diff -rup grub-0.97.orig/lib/device.c grub-0.97/lib/device.c Index: b/lib/device.c
--- grub-0.97.orig/lib/device.c 2006-11-29 20:36:20.000000000 +0100 ===================================================================
+++ grub-0.97/lib/device.c 2006-11-29 21:25:19.000000000 +0100 --- a/lib/device.c
+++ b/lib/device.c
@@ -18,10 +18,13 @@ @@ -18,10 +18,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */

3334
boot/grub/grub.400-nic_update2.patch
View File

File diff suppressed because it is too large Load Diff

6
boot/grub/grub.mk
View File

@ -6,8 +6,8 @@
GRUB_VERSION = 0.97 GRUB_VERSION = 0.97
GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
GRUB_PATCH = grub_$(GRUB_VERSION)-35.diff.gz GRUB_PATCH = grub_$(GRUB_VERSION)-67.diff.gz
GRUB_SITE = http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/ GRUB_SITE = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub/
GRUB_LICENSE = GPLv2+ GRUB_LICENSE = GPLv2+
GRUB_LICENSE_FILES = COPYING GRUB_LICENSE_FILES = COPYING
@ -64,7 +64,7 @@ GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_XFS),xfs)
define GRUB_DEBIAN_PATCHES define GRUB_DEBIAN_PATCHES
# Apply the patches from the Debian patch # Apply the patches from the Debian patch
(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \ (cd $(@D) ; for f in `cat debian/patches/series | grep -v ^#` ; do \
cat debian/patches/$$f | patch -g0 -p1 ; \ cat debian/patches/$$f | patch -g0 -p1 ; \
done) done)
endef endef