From fe77b43b3e7a2b096e918606e21ac80684beaec6 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 16 May 2004 19:06:26 +0000 Subject: [PATCH] Rene Rebe: updated grub and lilo + a grub patch to fix them for gcc-3.4 [2004050412310903789] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2916 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x86/grub/gcc34.patch | 17 ++++++++++++++ package/x86/grub/grub.desc | 4 ++-- package/x86/grub/reiserfs_fix.patch | 33 -------------------------- package/x86/lilo/activate.patch | 36 ----------------------------- package/x86/lilo/lilo.conf | 3 ++- package/x86/lilo/lilo.desc | 4 ++-- 6 files changed, 23 insertions(+), 74 deletions(-) create mode 100644 package/x86/grub/gcc34.patch delete mode 100644 package/x86/grub/reiserfs_fix.patch delete mode 100644 package/x86/lilo/activate.patch diff --git a/package/x86/grub/gcc34.patch b/package/x86/grub/gcc34.patch new file mode 100644 index 000000000..d27da60f4 --- /dev/null +++ b/package/x86/grub/gcc34.patch @@ -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 diff --git a/package/x86/grub/grub.desc b/package/x86/grub/grub.desc index 1409159b7..eb7667972 100644 --- a/package/x86/grub/grub.desc +++ b/package/x86/grub/grub.desc @@ -45,8 +45,8 @@ [L] GPL [S] Stable -[V] 0.93 +[V] 0.94 [P] X -----5---9 804.000 -[D] 2138434728 grub-0.93.tar.gz ftp://alpha.gnu.org/gnu/grub/ +[D] 0 grub-0.94.tar.gz ftp://alpha.gnu.org/gnu/grub/ diff --git a/package/x86/grub/reiserfs_fix.patch b/package/x86/grub/reiserfs_fix.patch deleted file mode 100644 index 7c9a646b5..000000000 --- a/package/x86/grub/reiserfs_fix.patch +++ /dev/null @@ -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 */ diff --git a/package/x86/lilo/activate.patch b/package/x86/lilo/activate.patch deleted file mode 100644 index 3178b9f46..000000000 --- a/package/x86/lilo/activate.patch +++ /dev/null @@ -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 - - # diff --git a/package/x86/lilo/lilo.conf b/package/x86/lilo/lilo.conf index 53c93db4f..5bb9ceb0c 100644 --- a/package/x86/lilo/lilo.conf +++ b/package/x86/lilo/lilo.conf @@ -24,7 +24,8 @@ pm_lilo() { if [ ! -f $root/etc/lilo.conf ] ; then cp $confdir/etc-lilo.conf $root/etc/lilo.conf fi - + + $MAKE activate cp -vf *.com activate $docdir cp $confdir/stone_mod_lilo.sh $root/etc/stone.d/mod_lilo.sh } diff --git a/package/x86/lilo/lilo.desc b/package/x86/lilo/lilo.desc index 76d56d874..7af1fadc3 100644 --- a/package/x86/lilo/lilo.desc +++ b/package/x86/lilo/lilo.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 22.5.8 +[V] 22.5.9 [P] X -----5---9 805.000 -[D] 544376810 lilo-22.5.8.tar.gz http://home.san.rr.com/johninsd/pub/linux/lilo/ +[D] 0 lilo-22.5.9.tar.gz http://home.san.rr.com/johninsd/pub/linux/lilo/