Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexey Shvetsov (alexxy)" <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r1.ebuild ChangeLog grub-9999.ebuild
Date: Wed, 31 Aug 2011 11:28:02
Message-Id: 20110831112751.EF2502004C@flycatcher.gentoo.org
1 alexxy 11/08/31 11:27:51
2
3 Modified: grub-1.99-r1.ebuild ChangeLog grub-9999.ebuild
4 Log:
5 [sys-boot/grub] Fix grub2 install on hardened systems
6
7 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 sys-boot/grub/grub-1.99-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild?r1=1.1&r2=1.2
15
16 Index: grub-1.99-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- grub-1.99-r1.ebuild 28 Aug 2011 10:50:33 -0000 1.1
23 +++ grub-1.99-r1.ebuild 31 Aug 2011 11:27:51 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2011 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v 1.1 2011/08/28 10:50:33 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v 1.2 2011/08/31 11:27:51 alexxy Exp $
29
30 EAPI=4
31
32 @@ -15,7 +15,7 @@
33 S=${WORKDIR}/${MY_P}
34 fi
35
36 -inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
37 +inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS}
38 unset LIVE_ECLASS
39
40 DESCRIPTION="GNU GRUB boot loader"
41 @@ -211,6 +211,24 @@
42 mv "${ED}"/usr/share/info/grub.info \
43 "${ED}"/usr/share/info/grub2.info || die
44
45 + # Do pax marking
46 + local PAX=(
47 + "sbin/grub2-probe"
48 + "sbin/grub2-setup"
49 + "sbin/grub2-mkdevicemap"
50 + "bin/grub2-script-check"
51 + "bin/grub2-fstest"
52 + "bin/grub2-mklayout"
53 + "bin/grub2-menulst2cfg"
54 + "bin/grub2-mkrelpath"
55 + "bin/grub2-mkpasswd-pbkdf2"
56 + "bin/grub2-editenv"
57 + "bin/grub2-mkimage"
58 + )
59 + for e in ${PAX[@]}; do
60 + pax-mark -mpx "${ED}/${e}"
61 + done
62 +
63 # can't be in docs array as we use defualt_src_install in different builddir
64 dodoc AUTHORS ChangeLog NEWS README THANKS TODO
65 insinto /etc/default
66
67
68
69 1.163 sys-boot/grub/ChangeLog
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.163&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.163&content-type=text/plain
73 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.162&r2=1.163
74
75 Index: ChangeLog
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
78 retrieving revision 1.162
79 retrieving revision 1.163
80 diff -u -r1.162 -r1.163
81 --- ChangeLog 30 Aug 2011 06:45:04 -0000 1.162
82 +++ ChangeLog 31 Aug 2011 11:27:51 -0000 1.163
83 @@ -1,6 +1,10 @@
84 # ChangeLog for sys-boot/grub
85 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
86 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.162 2011/08/30 06:45:04 scarabeus Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.163 2011/08/31 11:27:51 alexxy Exp $
88 +
89 + 31 Aug 2011; Alexey Shvetsov <alexxy@g.o> grub-1.99-r1.ebuild,
90 + grub-9999.ebuild:
91 + Fix grub2 install on hardened systems
92
93 30 Aug 2011; Tomáš Chvátal <scarabeus@g.o> files/grub.default:
94 Fix typo entrys -> entries.
95
96
97
98 1.40 sys-boot/grub/grub-9999.ebuild
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.40&view=markup
101 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.40&content-type=text/plain
102 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.39&r2=1.40
103
104 Index: grub-9999.ebuild
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
107 retrieving revision 1.39
108 retrieving revision 1.40
109 diff -u -r1.39 -r1.40
110 --- grub-9999.ebuild 28 Aug 2011 10:50:33 -0000 1.39
111 +++ grub-9999.ebuild 31 Aug 2011 11:27:51 -0000 1.40
112 @@ -1,6 +1,6 @@
113 # Copyright 1999-2011 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.39 2011/08/28 10:50:33 scarabeus Exp $
116 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.40 2011/08/31 11:27:51 alexxy Exp $
117
118 EAPI=4
119
120 @@ -15,7 +15,7 @@
121 S=${WORKDIR}/${MY_P}
122 fi
123
124 -inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
125 +inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS}
126 unset LIVE_ECLASS
127
128 DESCRIPTION="GNU GRUB boot loader"
129 @@ -211,6 +211,24 @@
130 mv "${ED}"/usr/share/info/grub.info \
131 "${ED}"/usr/share/info/grub2.info || die
132
133 + # Do pax marking
134 + local PAX=(
135 + "sbin/grub2-probe"
136 + "sbin/grub2-setup"
137 + "sbin/grub2-mkdevicemap"
138 + "bin/grub2-script-check"
139 + "bin/grub2-fstest"
140 + "bin/grub2-mklayout"
141 + "bin/grub2-menulst2cfg"
142 + "bin/grub2-mkrelpath"
143 + "bin/grub2-mkpasswd-pbkdf2"
144 + "bin/grub2-editenv"
145 + "bin/grub2-mkimage"
146 + )
147 + for e in ${PAX[@]}; do
148 + pax-mark -mpx "${ED}/${e}"
149 + done
150 +
151 # can't be in docs array as we use defualt_src_install in different builddir
152 dodoc AUTHORS ChangeLog NEWS README THANKS TODO
153 insinto /etc/default
Report Message
Find on MARC Find on Google Groups