Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild
Date: Sun, 03 Apr 2011 18:10:16
Message-Id: 20110403181001.B867D20057@flycatcher.gentoo.org
1 vapier 11/04/03 18:10:01
2
3 Modified: ChangeLog grub-9999.ebuild
4 Log:
5 Start an example /etc/defaults/grub #359365 by john.
6
7 (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.152 sys-boot/grub/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.152&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.152&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.151&r2=1.152
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
19 retrieving revision 1.151
20 retrieving revision 1.152
21 diff -u -r1.151 -r1.152
22 --- ChangeLog 3 Apr 2011 17:43:44 -0000 1.151
23 +++ ChangeLog 3 Apr 2011 18:10:01 -0000 1.152
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sys-boot/grub
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.151 2011/04/03 17:43:44 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.152 2011/04/03 18:10:01 vapier Exp $
29 +
30 + 03 Apr 2011; Mike Frysinger <vapier@g.o> grub-9999.ebuild,
31 + +files/defaults:
32 + Start an example /etc/defaults/grub #359365 by john.
33
34 03 Apr 2011; Mike Frysinger <vapier@g.o> grub-9999.ebuild:
35 Drop genkernel patch now that upstream has integrated it.
36
37
38
39 1.31 sys-boot/grub/grub-9999.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.31&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.31&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.30&r2=1.31
44
45 Index: grub-9999.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
48 retrieving revision 1.30
49 retrieving revision 1.31
50 diff -u -r1.30 -r1.31
51 --- grub-9999.ebuild 3 Apr 2011 17:43:44 -0000 1.30
52 +++ grub-9999.ebuild 3 Apr 2011 18:10:01 -0000 1.31
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.30 2011/04/03 17:43:44 vapier Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.31 2011/04/03 18:10:01 vapier Exp $
58
59 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
60
61 @@ -73,9 +73,13 @@
62 src_install() {
63 emake DESTDIR="${D}" install || die
64 dodoc AUTHORS ChangeLog NEWS README THANKS TODO
65 +
66 + insinto /etc/defaults
67 + doins "${FILESDIR}"/defaults || die
68 cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
69 GRUB_DISTRIBUTOR="Gentoo"
70 EOF
71 +
72 if use multislot ; then
73 sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
74 mv "${D}"/sbin/grub{,2}-install || die