| 1 |
robbat2 08/11/01 12:46:54 |
| 2 |
|
| 3 |
Modified: ChangeLog grub-0.97-r6.ebuild |
| 4 |
Log: |
| 5 |
Add a magic flag GRUB_STATIC_PACKAGE_BUILDING which along with USE='static -ncurses' is used to build grub-static tarballs from now on. |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.28-rc2-07920-g65fc716 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.102 sys-boot/grub/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.102&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.102&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.101&r2=1.102 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
| 18 |
retrieving revision 1.101 |
| 19 |
retrieving revision 1.102 |
| 20 |
diff -p -w -b -B -u -u -r1.101 -r1.102 |
| 21 |
--- ChangeLog 16 Aug 2008 15:27:59 -0000 1.101 |
| 22 |
+++ ChangeLog 1 Nov 2008 12:46:54 -0000 1.102 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sys-boot/grub |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.101 2008/08/16 15:27:59 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.102 2008/11/01 12:46:54 robbat2 Exp $ |
| 28 |
+ |
| 29 |
+ 01 Nov 2008; Robin H. Johnson <robbat2@g.o> grub-0.97-r6.ebuild: |
| 30 |
+ Add a magic flag GRUB_STATIC_PACKAGE_BUILDING which along with USE=static |
| 31 |
+ -ncurses is used to build grub-static tarballs from now on. |
| 32 |
|
| 33 |
16 Aug 2008; Mike Frysinger <vapier@g.o> grub-1.96.ebuild: |
| 34 |
Require lzo-1 #234182 by Kyle Elbert. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.9 sys-boot/grub/grub-0.97-r6.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild?rev=1.9&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild?rev=1.9&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild?r1=1.8&r2=1.9 |
| 43 |
|
| 44 |
Index: grub-0.97-r6.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v |
| 47 |
retrieving revision 1.8 |
| 48 |
retrieving revision 1.9 |
| 49 |
diff -p -w -b -B -u -u -r1.8 -r1.9 |
| 50 |
--- grub-0.97-r6.ebuild 7 Jul 2008 08:48:08 -0000 1.8 |
| 51 |
+++ grub-0.97-r6.ebuild 1 Nov 2008 12:46:54 -0000 1.9 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v 1.8 2008/07/07 08:48:08 robbat2 Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v 1.9 2008/11/01 12:46:54 robbat2 Exp $ |
| 57 |
|
| 58 |
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting |
| 59 |
# all systems to grub.conf (and symlinking menu.lst to grub.conf), but |
| 60 |
@@ -90,7 +90,15 @@ src_compile() { |
| 61 |
# Per bug 216625, the emul packages do not provide .a libs for performing |
| 62 |
# suitable static linking |
| 63 |
if use amd64 && use static ; then |
| 64 |
+ if [ -z "${GRUB_STATIC_PACKAGE_BUILDING}" ]; then |
| 65 |
die "You must use the grub-static package if you want a static Grub on amd64!" |
| 66 |
+ else |
| 67 |
+ eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This" |
| 68 |
+ eerror "is specifically intended for building the tarballs for the" |
| 69 |
+ eerror "grub-static package via USE='static -ncurses'." |
| 70 |
+ eerror "All bets are now off." |
| 71 |
+ ebeep 10 |
| 72 |
+ fi |
| 73 |
fi |
| 74 |
|
| 75 |
# build the net-bootable grub first, but only if "netboot" is set |
| 76 |
@@ -146,6 +154,12 @@ src_install() { |
| 77 |
dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO |
| 78 |
newdoc docs/menu.lst grub.conf.sample |
| 79 |
dodoc "${FILESDIR}"/grub.conf.gentoo |
| 80 |
+ prepalldocs |
| 81 |
+ |
| 82 |
+ [ -n "${GRUB_STATIC_PACKAGE_BUILDING}" ] && \ |
| 83 |
+ mv \ |
| 84 |
+ "${D}"/usr/share/doc/${PF} \ |
| 85 |
+ "${D}"/usr/share/doc/grub-static-${PF/grub-} |
| 86 |
|
| 87 |
insinto /usr/share/grub |
| 88 |
doins "${DISTDIR}"/splash.xpm.gz |
Archives