Rene Rebe
21 years ago
6 changed files with 23 additions and 74 deletions
Unified View
Diff Options
-
+17 -0package/x86/grub/gcc34.patch
-
+2 -2package/x86/grub/grub.desc
-
+0 -33package/x86/grub/reiserfs_fix.patch
-
+0 -36package/x86/lilo/activate.patch
-
+2 -1package/x86/lilo/lilo.conf
-
+2 -2package/x86/lilo/lilo.desc
@ -0,0 +1,17 @@ |
|||||
|
===================================================================
|
||||
|
RCS file: /cvsroot/grub/cvsroot/grub/grub/stage2/char_io.c,v |
||||
|
retrieving revision 1.51 |
||||
|
retrieving revision 1.52 |
||||
|
diff -u -r1.51 -r1.52
|
||||
|
--- grub/stage2/char_io.c 2002/12/09 06:27:05 1.51
|
||||
|
+++ grub/stage2/char_io.c 2004/03/27 17:02:54 1.52
|
||||
|
@@ -1265,3 +1265,9 @@
|
||||
|
return dest; |
||||
|
} |
||||
|
#endif /* ! STAGE1_5 */ |
||||
|
+
|
||||
|
+#ifndef GRUB_UTIL
|
||||
|
+# undef memcpy
|
||||
|
+/* GCC emits references to memcpy() for struct copies etc. */
|
||||
|
+void *memcpy (void *dest, const void *src, int n) __attribute__ ((alias ("grub_memmove")));
|
||||
|
+#endif
|
||||
@ -1,33 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/x86/grub/reiserfs_fix.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
--- ./stage2/fsys_reiserfs.c.orig 2003-06-24 23:23:26.012894384 +0200
|
|
||||
+++ ./stage2/fsys_reiserfs.c 2003-06-24 23:24:04.525039648 +0200
|
|
||||
@@ -112,7 +112,7 @@
|
|
||||
/* offset in the log of where to start replay after a crash */ |
|
||||
__u32 j_first_unflushed_offset; |
|
||||
/* mount id to detect very old transactions */ |
|
||||
- __u32 long j_mount_id;
|
|
||||
+ __u32 j_mount_id;
|
|
||||
}; |
|
||||
|
|
||||
/* magic string to find desc blocks in the journal */ |
|
||||
@ -1,36 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/x86/lilo/activate.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
Please don't re-enable pseudo.b, it's for testing purposes only and |
|
||||
requires a full dev86 package (rock includes the bin86 part only). |
|
||||
|
|
||||
--- ./Makefile.orig 2003-12-11 16:48:40.000000000 -0600
|
|
||||
+++ ./Makefile 2003-12-11 16:49:52.000000000 -0600
|
|
||||
@@ -107,7 +107,7 @@
|
|
||||
|
|
||||
.SUFFIXES: .img .b .com .S .s |
|
||||
|
|
||||
-all: lilo bootsect.b disk.com pseudo.b # $(BOOTS) edit dparam.com activate
|
|
||||
+all: lilo bootsect.b disk.com $(BOOTS) edit dparam.com activate # pseudo.b
|
|
||||
if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then make diagnostic; fi |
|
||||
|
|
||||
# |
|
||||