1 |
phajdan.jr 10/03/01 10:30:22 |
2 |
|
3 |
Modified: ChangeLog chromium-bin-5.0.308.0_p37385.ebuild |
4 |
chromium-bin-9999.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.59 www-client/chromium-bin/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.59&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.59&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?r1=1.58&r2=1.59 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v |
19 |
retrieving revision 1.58 |
20 |
retrieving revision 1.59 |
21 |
diff -u -r1.58 -r1.59 |
22 |
--- ChangeLog 11 Feb 2010 17:01:59 -0000 1.58 |
23 |
+++ ChangeLog 1 Mar 2010 10:30:21 -0000 1.59 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for www-client/chromium-bin |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.58 2010/02/11 17:01:59 voyageur Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.59 2010/03/01 10:30:21 phajdan.jr Exp $ |
29 |
+ |
30 |
+ 01 Mar 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
31 |
+ chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild: |
32 |
+ Add check for $ROOT in the /dev/shm sanity check wrt latest comments in |
33 |
+ bug #299777. |
34 |
|
35 |
11 Feb 2010; Bernard Cafarelli <voyageur@g.o> |
36 |
chromium-bin-4.0.295.0_p35884.ebuild, |
37 |
|
38 |
|
39 |
|
40 |
1.5 www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild?rev=1.5&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild?rev=1.5&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild?r1=1.4&r2=1.5 |
45 |
|
46 |
Index: chromium-bin-5.0.308.0_p37385.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v |
49 |
retrieving revision 1.4 |
50 |
retrieving revision 1.5 |
51 |
diff -u -r1.4 -r1.5 |
52 |
--- chromium-bin-5.0.308.0_p37385.ebuild 11 Feb 2010 17:01:59 -0000 1.4 |
53 |
+++ chromium-bin-5.0.308.0_p37385.ebuild 1 Mar 2010 10:30:21 -0000 1.5 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.4 2010/02/11 17:01:59 voyageur Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.5 2010/03/01 10:30:21 phajdan.jr Exp $ |
59 |
|
60 |
EAPI="2" |
61 |
inherit eutils multilib portability |
62 |
@@ -46,24 +46,26 @@ |
63 |
QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libffmpegsumo.so" |
64 |
|
65 |
pkg_setup() { |
66 |
- # Built with SSE2 enabled, so will fail on older processors |
67 |
- if [[ ${ROOT} == "/" ]] && ! grep -q sse2 /proc/cpuinfo; then |
68 |
- die "This binary requires SSE2 support, it will not work on older processors" |
69 |
- fi |
70 |
- |
71 |
- # Prevent user problems like bug 299777. |
72 |
- if ! grep -q /dev/shm <<< $(get_mounts); then |
73 |
- eerror "You don't have tmpfs mounted at /dev/shm." |
74 |
- eerror "${PN} isn't going to work in that configuration." |
75 |
- eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
76 |
- eerror "run 'mount /dev/shm' and try again." |
77 |
- die "/dev/shm is not mounted" |
78 |
- fi |
79 |
- if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
80 |
- eerror "/dev/shm does not have correct permissions." |
81 |
- eerror "${PN} isn't going to work in that configuration." |
82 |
- eerror "Please run chmod 1777 /dev/shm and try again." |
83 |
- die "/dev/shm has incorrect permissions" |
84 |
+ if [[ "${ROOT}" == "/" ]]; then |
85 |
+ # Built with SSE2 enabled, so will fail on older processors |
86 |
+ if ! grep -q sse2 /proc/cpuinfo; then |
87 |
+ die "This binary requires SSE2 support, it will not work on older processors" |
88 |
+ fi |
89 |
+ |
90 |
+ # Prevent user problems like bug 299777. |
91 |
+ if ! grep -q /dev/shm <<< $(get_mounts); then |
92 |
+ eerror "You don't have tmpfs mounted at /dev/shm." |
93 |
+ eerror "${PN} isn't going to work in that configuration." |
94 |
+ eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
95 |
+ eerror "run 'mount /dev/shm' and try again." |
96 |
+ die "/dev/shm is not mounted" |
97 |
+ fi |
98 |
+ if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
99 |
+ eerror "/dev/shm does not have correct permissions." |
100 |
+ eerror "${PN} isn't going to work in that configuration." |
101 |
+ eerror "Please run chmod 1777 /dev/shm and try again." |
102 |
+ die "/dev/shm has incorrect permissions" |
103 |
+ fi |
104 |
fi |
105 |
} |
106 |
|
107 |
|
108 |
|
109 |
|
110 |
1.35 www-client/chromium-bin/chromium-bin-9999.ebuild |
111 |
|
112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.35&view=markup |
113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.35&content-type=text/plain |
114 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?r1=1.34&r2=1.35 |
115 |
|
116 |
Index: chromium-bin-9999.ebuild |
117 |
=================================================================== |
118 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v |
119 |
retrieving revision 1.34 |
120 |
retrieving revision 1.35 |
121 |
diff -u -r1.34 -r1.35 |
122 |
--- chromium-bin-9999.ebuild 11 Feb 2010 17:01:59 -0000 1.34 |
123 |
+++ chromium-bin-9999.ebuild 1 Mar 2010 10:30:21 -0000 1.35 |
124 |
@@ -1,6 +1,6 @@ |
125 |
# Copyright 1999-2010 Gentoo Foundation |
126 |
# Distributed under the terms of the GNU General Public License v2 |
127 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.34 2010/02/11 17:01:59 voyageur Exp $ |
128 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.35 2010/03/01 10:30:21 phajdan.jr Exp $ |
129 |
|
130 |
EAPI="2" |
131 |
inherit eutils multilib portability |
132 |
@@ -40,24 +40,26 @@ |
133 |
QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libffmpegsumo.so" |
134 |
|
135 |
pkg_setup() { |
136 |
- # Built with SSE2 enabled, so will fail on older processors |
137 |
- if [[ ${ROOT} == "/" ]] && ! grep -q sse2 /proc/cpuinfo; then |
138 |
- die "This binary requires SSE2 support, it will not work on older processors" |
139 |
- fi |
140 |
- |
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 |
+ if [[ "${ROOT}" == "/" ]]; then |
155 |
+ # Built with SSE2 enabled, so will fail on older processors |
156 |
+ if ! grep -q sse2 /proc/cpuinfo; then |
157 |
+ die "This binary requires SSE2 support, it will not work on older processors" |
158 |
+ fi |
159 |
+ |
160 |
+ # Prevent user problems like bug 299777. |
161 |
+ if ! grep -q /dev/shm <<< $(get_mounts); then |
162 |
+ eerror "You don't have tmpfs mounted at /dev/shm." |
163 |
+ eerror "${PN} isn't going to work in that configuration." |
164 |
+ eerror "Please uncomment the /dev/shm entry in /etc/fstab," |
165 |
+ eerror "run 'mount /dev/shm' and try again." |
166 |
+ die "/dev/shm is not mounted" |
167 |
+ fi |
168 |
+ if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
169 |
+ eerror "/dev/shm does not have correct permissions." |
170 |
+ eerror "${PN} isn't going to work in that configuration." |
171 |
+ eerror "Please run chmod 1777 /dev/shm and try again." |
172 |
+ die "/dev/shm has incorrect permissions" |
173 |
+ fi |
174 |
fi |
175 |
} |