diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-05-10 09:00:56 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-05-10 09:00:56 +0000 |
| commit | 969b94d86e312bd57805a9b309207e6276a738cd (patch) | |
| tree | 5cfb6fd56c03e7d7d005e4697a90a30be4b7ac38 /sys-boot/grub | |
| parent | Stable on ppc wrt bug 220929 (diff) | |
| download | historical-969b94d86e312bd57805a9b309207e6276a738cd.tar.gz historical-969b94d86e312bd57805a9b309207e6276a738cd.tar.bz2 historical-969b94d86e312bd57805a9b309207e6276a738cd.zip | |
Restore menu.lst symlink #220737 / #221055.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 12 |
3 files changed, 21 insertions, 8 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 5c6f2733327c..98ac4519c482 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # 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.91 2008/05/06 14:23:28 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.92 2008/05/10 09:00:56 vapier Exp $ + + 10 May 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild: + Restore menu.lst symlink #220737 / #221055. 06 May 2008; Christian Faulhammer <opfer@gentoo.org> grub-0.97-r5.ebuild: stable x86, bug 220069 diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index cc4def8ceb11..785add57bb6b 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -26,15 +26,15 @@ 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 6436 RMD160 8101aebd3b65e77988b35c91c7229ba009a2abdd SHA1 56f8c3408c3fc6681019f02ca99987561fdee4c2 SHA256 abfd9a12787bc8bea94e7030d1aa8b4f6cde804aa8e04b9b7a3a69ba975b1275 +EBUILD grub-0.97-r5.ebuild 6880 RMD160 942a63d78c6c1f58f7139b5df863c89466484828 SHA1 e684dfe0429d53776e1c6518c1a29f1340eccd5f SHA256 bc7d6d3c392f69d21115adefbb34ddbab2b56fdcfad3063518ae95aff82ab1b1 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.96.ebuild 955 RMD160 0065ef0437d4f9f5bc8014402e4c598b66fe6961 SHA1 c6ce24be9fd6b5bbd2ce598820f3410f5aaf2a70 SHA256 9d6049ecf33d1d877f8c1bf8b938d91a7c09c005a5a1fd8b5d7018fe70172a39 -MISC ChangeLog 21520 RMD160 c38c55ea58d81e929bab629c03eaec585b62cd6a SHA1 8024081c32c6e7b3f6816451ec770cfce77325b5 SHA256 50c7388b67c5109d7de1de893dd9ec7acf50b15d80079f1c256b772670933810 +MISC ChangeLog 21639 RMD160 e766482a59e03bc9d27f4beaced162cf447e557d SHA1 139e405841f965c39b0bf34ee7a94ec6c8f0cd53 SHA256 ab977d9f1efe7801d9396a938eb6b6fa0ff1dafd3ec2f28535c8521a1d31203d MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.7 (GNU/Linux) -iEYEARECAAYFAkggafEACgkQNQqtfCuFneOZKACghVzi8VSeNucwlTZxEyVV1fU1 -vjsAn3f22FnBTqIoFRoN9afvQIlZf53S -=Cbd4 +iD8DBQFIJWROj9hvisErhMIRAtYuAJ9Dj7k1WcHUwAv9wTDP6YL5seZrRQCfU8h3 +3Gm+dlvbfhbWJE0s/N87M90= +=zuxK -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild index 4cd24fc5524d..86e502b1662e 100644 --- a/sys-boot/grub/grub-0.97-r5.ebuild +++ b/sys-boot/grub/grub-0.97-r5.ebuild @@ -1,6 +1,11 @@ # 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.11 2008/05/06 14:23:28 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.12 2008/05/10 09:00:56 vapier Exp $ + +# XXX: we need to review menu.lst vs grub.conf handling. We've been converting +# all systems to grub.conf (and symlinking menu.lst to grub.conf), but +# we never updated any of the source code (it still all wants menu.lst), +# and there is no indication that upstream is making the transition. inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -164,6 +169,11 @@ setup_boot_dir() { ewarn fi + if [[ ! -e ${dir}/menu.lst ]]; then + einfo "Linking from new grub.conf name to menu.lst" + ln -snf grub.conf "${dir}"/menu.lst + fi + if [[ -e ${dir}/stage2 ]] ; then mv "${dir}"/stage2{,.old} ewarn "*** IMPORTANT NOTE: you must run grub and install" |