1 |
phajdan.jr 10/03/01 10:27:00 |
2 |
|
3 |
Modified: chromium-5.0.335.0.ebuild ChangeLog |
4 |
chromium-9999.ebuild chromium-5.0.307.11.ebuild |
5 |
Log: |
6 |
Add check for $ROOT in the /dev/shm sanity check wrt latest comments in bug #299777. |
7 |
(Portage version: 2.1.7.16/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 www-client/chromium/chromium-5.0.335.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: chromium-5.0.335.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- chromium-5.0.335.0.ebuild 25 Feb 2010 09:06:18 -0000 1.1 |
23 |
+++ chromium-5.0.335.0.ebuild 1 Mar 2010 10:26:59 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild,v 1.1 2010/02/25 09:06:18 phajdan.jr Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild,v 1.2 2010/03/01 10:26:59 phajdan.jr Exp $ |
29 |
|
30 |
EAPI="2" |
31 |
inherit eutils flag-o-matic multilib portability toolchain-funcs |
32 |
@@ -41,19 +41,21 @@ |
33 |
sys-devel/flex" |
34 |
|
35 |
pkg_setup() { |
36 |
- # Prevent user problems like bug 299777. |
37 |
- if ! grep -q /dev/shm <<< $(get_mounts); then |
38 |
- eerror "You don't have tmpfs mounted at /dev/shm." |
39 |
- eerror "${PN} isn't going to work in that configuration." |
40 |
- eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
41 |
- eerror "run 'mount /dev/shm' and try again." |
42 |
- die "/dev/shm is not mounted" |
43 |
- fi |
44 |
- if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
45 |
- eerror "/dev/shm does not have correct permissions." |
46 |
- eerror "${PN} isn't going to work in that configuration." |
47 |
- eerror "Please run chmod 1777 /dev/shm and try again." |
48 |
- die "/dev/shm has incorrect permissions" |
49 |
+ if [[ "${ROOT}" == "/" ]]; then |
50 |
+ # Prevent user problems like bug 299777. |
51 |
+ if ! grep -q /dev/shm <<< $(get_mounts); then |
52 |
+ eerror "You don't have tmpfs mounted at /dev/shm." |
53 |
+ eerror "${PN} isn't going to work in that configuration." |
54 |
+ eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
55 |
+ eerror "run 'mount /dev/shm' and try again." |
56 |
+ die "/dev/shm is not mounted" |
57 |
+ fi |
58 |
+ if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
59 |
+ eerror "/dev/shm does not have correct permissions." |
60 |
+ eerror "${PN} isn't going to work in that configuration." |
61 |
+ eerror "Please run chmod 1777 /dev/shm and try again." |
62 |
+ die "/dev/shm has incorrect permissions" |
63 |
+ fi |
64 |
fi |
65 |
|
66 |
elog "${PN} might crash occasionally. To get more useful backtraces" |
67 |
|
68 |
|
69 |
|
70 |
1.62 www-client/chromium/ChangeLog |
71 |
|
72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.62&view=markup |
73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.62&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.61&r2=1.62 |
75 |
|
76 |
Index: ChangeLog |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
79 |
retrieving revision 1.61 |
80 |
retrieving revision 1.62 |
81 |
diff -u -r1.61 -r1.62 |
82 |
--- ChangeLog 27 Feb 2010 15:50:21 -0000 1.61 |
83 |
+++ ChangeLog 1 Mar 2010 10:26:59 -0000 1.62 |
84 |
@@ -1,6 +1,12 @@ |
85 |
# ChangeLog for www-client/chromium |
86 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.61 2010/02/27 15:50:21 phajdan.jr Exp $ |
88 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.62 2010/03/01 10:26:59 phajdan.jr Exp $ |
89 |
+ |
90 |
+ 01 Mar 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
91 |
+ chromium-5.0.307.11.ebuild, chromium-5.0.335.0.ebuild, |
92 |
+ chromium-9999.ebuild: |
93 |
+ Add check for $ROOT in the /dev/shm sanity check wrt latest comments in |
94 |
+ bug #299777. |
95 |
|
96 |
*chromium-5.0.307.11 (27 Feb 2010) |
97 |
|
98 |
|
99 |
|
100 |
|
101 |
1.31 www-client/chromium/chromium-9999.ebuild |
102 |
|
103 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.31&view=markup |
104 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.31&content-type=text/plain |
105 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.30&r2=1.31 |
106 |
|
107 |
Index: chromium-9999.ebuild |
108 |
=================================================================== |
109 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v |
110 |
retrieving revision 1.30 |
111 |
retrieving revision 1.31 |
112 |
diff -u -r1.30 -r1.31 |
113 |
--- chromium-9999.ebuild 23 Feb 2010 18:26:17 -0000 1.30 |
114 |
+++ chromium-9999.ebuild 1 Mar 2010 10:26:59 -0000 1.31 |
115 |
@@ -1,6 +1,6 @@ |
116 |
# Copyright 1999-2010 Gentoo Foundation |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.30 2010/02/23 18:26:17 armin76 Exp $ |
119 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.31 2010/03/01 10:26:59 phajdan.jr Exp $ |
120 |
|
121 |
EAPI="2" |
122 |
inherit eutils flag-o-matic multilib portability subversion toolchain-funcs |
123 |
@@ -42,19 +42,21 @@ |
124 |
sys-devel/flex" |
125 |
|
126 |
pkg_setup() { |
127 |
- # Prevent user problems like bug 299777. |
128 |
- if ! grep -q /dev/shm <<< $(get_mounts); then |
129 |
- eerror "You don't have tmpfs mounted at /dev/shm." |
130 |
- eerror "${PN} isn't going to work in that configuration." |
131 |
- eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
132 |
- eerror "run 'mount /dev/shm' and try again." |
133 |
- die "/dev/shm is not mounted" |
134 |
- fi |
135 |
- if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
136 |
- eerror "/dev/shm does not have correct permissions." |
137 |
- eerror "${PN} isn't going to work in that configuration." |
138 |
- eerror "Please run chmod 1777 /dev/shm and try again." |
139 |
- die "/dev/shm has incorrect permissions" |
140 |
+ if [[ "${ROOT}" == "/" ]]; then |
141 |
+ # Prevent user problems like bug 299777. |
142 |
+ if ! grep -q /dev/shm <<< $(get_mounts); then |
143 |
+ eerror "You don't have tmpfs mounted at /dev/shm." |
144 |
+ eerror "${PN} isn't going to work in that configuration." |
145 |
+ eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
146 |
+ eerror "run 'mount /dev/shm' and try again." |
147 |
+ die "/dev/shm is not mounted" |
148 |
+ fi |
149 |
+ if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
150 |
+ eerror "/dev/shm does not have correct permissions." |
151 |
+ eerror "${PN} isn't going to work in that configuration." |
152 |
+ eerror "Please run chmod 1777 /dev/shm and try again." |
153 |
+ die "/dev/shm has incorrect permissions" |
154 |
+ fi |
155 |
fi |
156 |
|
157 |
elog "${PN} might crash occasionally. To get more useful backtraces" |
158 |
|
159 |
|
160 |
|
161 |
1.2 www-client/chromium/chromium-5.0.307.11.ebuild |
162 |
|
163 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild?rev=1.2&view=markup |
164 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild?rev=1.2&content-type=text/plain |
165 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild?r1=1.1&r2=1.2 |
166 |
|
167 |
Index: chromium-5.0.307.11.ebuild |
168 |
=================================================================== |
169 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild,v |
170 |
retrieving revision 1.1 |
171 |
retrieving revision 1.2 |
172 |
diff -u -r1.1 -r1.2 |
173 |
--- chromium-5.0.307.11.ebuild 27 Feb 2010 15:50:21 -0000 1.1 |
174 |
+++ chromium-5.0.307.11.ebuild 1 Mar 2010 10:26:59 -0000 1.2 |
175 |
@@ -1,6 +1,6 @@ |
176 |
# Copyright 1999-2010 Gentoo Foundation |
177 |
# Distributed under the terms of the GNU General Public License v2 |
178 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild,v 1.1 2010/02/27 15:50:21 phajdan.jr Exp $ |
179 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild,v 1.2 2010/03/01 10:26:59 phajdan.jr Exp $ |
180 |
|
181 |
EAPI="2" |
182 |
inherit eutils flag-o-matic multilib portability toolchain-funcs |
183 |
@@ -41,19 +41,21 @@ |
184 |
sys-devel/flex" |
185 |
|
186 |
pkg_setup() { |
187 |
- # Prevent user problems like bug 299777. |
188 |
- if ! grep -q /dev/shm <<< $(get_mounts); then |
189 |
- eerror "You don't have tmpfs mounted at /dev/shm." |
190 |
- eerror "${PN} isn't going to work in that configuration." |
191 |
- eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
192 |
- eerror "run 'mount /dev/shm' and try again." |
193 |
- die "/dev/shm is not mounted" |
194 |
- fi |
195 |
- if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
196 |
- eerror "/dev/shm does not have correct permissions." |
197 |
- eerror "${PN} isn't going to work in that configuration." |
198 |
- eerror "Please run chmod 1777 /dev/shm and try again." |
199 |
- die "/dev/shm has incorrect permissions" |
200 |
+ if [[ "${ROOT}" == "/" ]]; then |
201 |
+ # Prevent user problems like bug 299777. |
202 |
+ if ! grep -q /dev/shm <<< $(get_mounts); then |
203 |
+ eerror "You don't have tmpfs mounted at /dev/shm." |
204 |
+ eerror "${PN} isn't going to work in that configuration." |
205 |
+ eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
206 |
+ eerror "run 'mount /dev/shm' and try again." |
207 |
+ die "/dev/shm is not mounted" |
208 |
+ fi |
209 |
+ if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
210 |
+ eerror "/dev/shm does not have correct permissions." |
211 |
+ eerror "${PN} isn't going to work in that configuration." |
212 |
+ eerror "Please run chmod 1777 /dev/shm and try again." |
213 |
+ die "/dev/shm has incorrect permissions" |
214 |
+ fi |
215 |
fi |
216 |
|
217 |
elog "${PN} might crash occasionally. To get more useful backtraces" |