From 0aa4b4222e75d32b3b829dd45b1ae728a0c6fef3 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 24 Dec 2005 14:57:16 +0000 Subject: [PATCH] Clifford Wolf: Updated grub (1.91) [2005121417475411179] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6812 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x86/grub/gcc40.patch | 55 ------------------------------------ package/x86/grub/grub.conf | 5 ---- package/x86/grub/grub.desc | 4 +-- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 package/x86/grub/gcc40.patch diff --git a/package/x86/grub/gcc40.patch b/package/x86/grub/gcc40.patch deleted file mode 100644 index aabc07800..000000000 --- a/package/x86/grub/gcc40.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -dur grub-0.97/netboot/main.c src.grub.1130286324.30284.3996273791/grub-0.97/netboot/main.c ---- grub-0.97/netboot/main.c 2004-05-21 00:19:33.000000000 +0200 -+++ src.grub.1130286324.30284.3996273791/grub-0.97/netboot/main.c 2005-10-26 02:37:58.000000000 +0200 -@@ -54,9 +54,9 @@ - - static int vendorext_isvalid; - static unsigned long netmask; --static struct bootpd_t bootp_data; -+struct bootpd_t bootp_data; - static unsigned long xid; --static unsigned char *end_of_rfc1533 = NULL; -+unsigned char *end_of_rfc1533 = NULL; - - #ifndef NO_DHCP_SUPPORT - #endif /* NO_DHCP_SUPPORT */ ---- grub-0.97/netboot/natsemi.c 2003-07-09 13:45:38.000000000 +0200 -+++ src.grub.1130288662.25040.1734126933/grub-0.97/netboot/natsemi.c 2005-10-26 03:18:03.000000000 +0200 -@@ -608,7 +608,7 @@ - const char *p) /* Packet */ - { - u32 status, to, nstype; -- u32 tx_status; -+ volatile u32 tx_status; - - /* Stop the transmitter */ - outl(TxOff, ioaddr + ChipCmd); -@@ -647,7 +647,7 @@ - - to = currticks() + TX_TIMEOUT; - -- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) -+ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) - /* wait */ ; - - if (currticks() >= to) { ---- grub-0.97/netboot/sis900.c~ 2003-07-09 13:45:38.000000000 +0200 -+++ grub-0.97/netboot/sis900.c 2005-10-26 03:30:39.000000000 +0200 -@@ -901,7 +901,7 @@ - const char *p) /* Packet */ - { - u32 status, to, nstype; -- u32 tx_status; -+ volatile u32 tx_status; - - /* Stop the transmitter */ - outl(TxDIS, ioaddr + cr); -@@ -940,7 +940,7 @@ - - to = currticks() + TX_TIMEOUT; - -- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) -+ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) - /* wait */ ; - - if (currticks() >= to) { diff --git a/package/x86/grub/grub.conf b/package/x86/grub/grub.conf index edcc94808..00ff11e12 100644 --- a/package/x86/grub/grub.conf +++ b/package/x86/grub/grub.conf @@ -30,11 +30,6 @@ grub_postmake() { cp $confdir/stone_mod_grub.sh $root/etc/stone.d/mod_grub.sh echo '$STONE grub grub_setup' > $root/etc/stone.d/setup_grub.sh - if [ ! -f $root/boot/grub/menu.lst ] ; then - cp docs/menu.lst $root/boot/grub/ - fi - cp docs/menu.lst $root/boot/grub/menu.lst.example - counter=1 confopt="$confopt --enable-diskless" { echo diff --git a/package/x86/grub/grub.desc b/package/x86/grub/grub.desc index 5426a922a..4dda03171 100644 --- a/package/x86/grub/grub.desc +++ b/package/x86/grub/grub.desc @@ -46,8 +46,8 @@ [L] GPL [S] Stable -[V] 0.97 +[V] 1.91 [P] X -?---5---9 203.900 -[D] 3065767847 grub-0.97.tar.gz ftp://alpha.gnu.org/gnu/grub/ +[D] 1863347191 grub-1.91.tar.gz ftp://alpha.gnu.org/gnu/grub/