summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-03-30 17:20:32 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-03-30 17:20:32 +0000
commit503e3b60822a382a439d06a02ea7a83e336d6bfb (patch)
tree796387505c808bd121aaf28f5b024484f0fdc3e7 /sys-boot
parentAdded ~ppc64 (diff)
downloadhistorical-503e3b60822a382a439d06a02ea7a83e336d6bfb.tar.gz
historical-503e3b60822a382a439d06a02ea7a83e336d6bfb.tar.bz2
historical-503e3b60822a382a439d06a02ea7a83e336d6bfb.zip
Bring in the warning from bug #98768, as it's now important with the new Grub patches.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/Manifest4
-rw-r--r--sys-boot/grub/grub-0.97-r5.ebuild13
3 files changed, 18 insertions, 5 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index e2b10c25eef8..bfdc7f06f3dc 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.85 2008/03/30 05:12:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.86 2008/03/30 17:20:32 robbat2 Exp $
+
+ 30 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild:
+ Bring in the warning from bug #98768, as it's now important with the new
+ Grub patches.
30 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild:
Per bug #160801, Grub needs modification to support kernels larger than
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4ce2c35ca354..8f1b1807f3f7 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -23,8 +23,8 @@ EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b
EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429
EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9
EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e
-EBUILD grub-0.97-r5.ebuild 6014 RMD160 43b212169ea61c5ab186b82f8b5e960f7d5dcf83 SHA1 9a6a8bf3bd113815eadbc040049f58535093fb96 SHA256 1643130a9aadfc3528580e069d305e2b4a7cc971ee657833ad58652a9e83df3c
+EBUILD grub-0.97-r5.ebuild 6374 RMD160 774e9c8d8d7a17942902d5334834c598b64f376b SHA1 1cb40fc394a075f2acd1165bd72807f9bc613569 SHA256 a8da8aa6cad916bed0fb3157af57055ac76e57369800b658eaa9ba169b689921
EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
EBUILD grub-1.96.ebuild 956 RMD160 f462517b57bda30e9e4b64c43e691099d0beeb9a SHA1 55629e1cf96e29ff702c36d579c08c7487708698 SHA256 8bb370a35d006fa89133863c0393b6356be8e8f66ad3f34f63750624d9b46cb4
-MISC ChangeLog 20698 RMD160 ea82a8e0bb3127253a1995c3073322e354d05e68 SHA1 1d31379462e5943b6a0cd9fc942952cf2de1cabf SHA256 9d211ad295f1eea02ec723c85e5f0a37dbc52a94ef957fad7e326b5843964611
+MISC ChangeLog 20864 RMD160 5c7118e3679e479b9026ebfe08a9cc44e16e45e1 SHA1 9de8fbc7078ec2dbd508996f4f970fb29b688417 SHA256 b6653912fb2f0943bc71a3efab255f53bc8620bc4469c551792cebb27db248c9
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild
index 9c7fa880b9bc..8cc0e5ae9ea8 100644
--- a/sys-boot/grub/grub-0.97-r5.ebuild
+++ b/sys-boot/grub/grub-0.97-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.4 2008/03/30 05:12:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.5 2008/03/30 17:20:32 robbat2 Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
@@ -163,7 +163,16 @@ setup_boot_dir() {
ln -snf grub.conf "${dir}"/menu.lst
fi
- [[ -e ${dir}/stage2 ]] && mv "${dir}"/stage2{,.old}
+ if [[ -e ${dir}/stage2 ]]; then
+ mv "${dir}"/stage2 \
+ "${dir}"/stage2-$(date -u +%Y%m%d-%H%MZ)
+ ewarn "*** IMPORTANT NOTE: you must run grub and install"
+ ewarn "the new version's stage1 to your MBR. Until you do,"
+ ewarn "stage1 and stage2 will still be the old version, but"
+ ewarn "later stages will be the new version, which could"
+ ewarn "cause problems such as an unbootable system."
+ ebeep
+ fi
einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}"
for x in "${ROOT}"/lib*/grub/*/* "${ROOT}"/usr/lib*/grub/*/* ; do