diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-06 22:41:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-06 22:41:51 +0000 |
| commit | 50aaa0e438adefa0b542dde61f7525c414d298e4 (patch) | |
| tree | af5c1cd761fef774637dce4023b5eba4b38e38b2 | |
| parent | orphanize -- packages that require dietlibc do not go in base-system (diff) | |
| download | historical-50aaa0e438adefa0b542dde61f7525c414d298e4.tar.gz historical-50aaa0e438adefa0b542dde61f7525c414d298e4.tar.bz2 historical-50aaa0e438adefa0b542dde61f7525c414d298e4.zip | |
Create /boot/boot symlink for people #194201, and dont bother creating menu.lst symlink.
Package-Manager: portage-2.2_pre5
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 10 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 15 |
3 files changed, 15 insertions, 16 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index bfdc7f06f3dc..f7fff498d966 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.86 2008/03/30 17:20:32 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.87 2008/04/06 22:41:51 vapier Exp $ + + 06 Apr 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild: + Create /boot/boot symlink for people #194201, and dont bother creating + menu.lst symlink. 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 diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index aafea70443c9..6f4d17e4d9a8 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 6340 RMD160 417dba6e14c9f40c988b0d1e1a73cf64e547abc9 SHA1 4dd2ba57e4309d551ff8040fc4d8bebc5bcd7320 SHA256 fbede1c24d06ab52a3309dbaa30e05029a70e1ff8c595b937abf077505916d8c +EBUILD grub-0.97-r5.ebuild 6215 RMD160 66a8311233bcdd43d1f106460299deaef12a298a SHA1 1a2b0ac1ca321ac7167518647c8ba4319a872428 SHA256 2c1693fa58427c1198c2d109d65fedfa16bf2bcb3ad62e20fdde29592dd97741 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 20864 RMD160 5c7118e3679e479b9026ebfe08a9cc44e16e45e1 SHA1 9de8fbc7078ec2dbd508996f4f970fb29b688417 SHA256 b6653912fb2f0943bc71a3efab255f53bc8620bc4469c551792cebb27db248c9 +MISC ChangeLog 21028 RMD160 e803cfd9980e57934cf0f9274251f7c2d8215f4a SHA1 7a0d0f98d83bd88759c591d5d2499fdfc06a7710 SHA256 aa330e75a7787ff6f0d8705023ceca30cc140b4c7ea7d6c8f5b9371f235a84d7 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH787Fj9hvisErhMIRAgIYAJwPKQWQ8iOwy84jsSSeXWR5eJOhrgCfY2PL -WcLcsw8DuzaOM0UYYipA3Ug= -=Snas +iD8DBQFH+VG1j9hvisErhMIRAsb8AJ9gz40BeP8mtPuCo2Mt+anWEhp1UwCgyqdW +yNDOyh67Q8q9RmDDs8n48FY= +=Ud/J -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild index 2efeaecb9011..e05677716990 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.6 2008/03/30 17:29:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.7 2008/04/06 22:41:51 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -132,12 +132,11 @@ src_install() { doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install" fi - insinto /boot/grub - doins "${DISTDIR}"/splash.xpm.gz - newins docs/menu.lst grub.conf.sample - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO newdoc docs/menu.lst grub.conf.sample + + insinto /boot/grub + doins "${DISTDIR}"/splash.xpm.gz } setup_boot_dir() { @@ -145,6 +144,7 @@ setup_boot_dir() { local dir=${boot_dir} [[ ! -e ${dir} ]] && die "${dir} does not exist!" + [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" dir="${dir}/grub" if [[ ! -e ${dir} ]] ; then mkdir "${dir}" || die "${dir} does not exist!" @@ -158,11 +158,6 @@ 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" |