From: Paweł Hajdan Date: Mon, 1 Mar 2010 10:30:21 +0000 (+0000) Subject: Add check for $ROOT in the /dev/shm sanity check wrt latest comments in bug #299777. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb1952a6ffed1ac0097985e1d508dd1293166ffd;p=gentoo.git Add check for $ROOT in the /dev/shm sanity check wrt latest comments in bug #299777. Package-Manager: portage-2.1.7.16/cvs/Linux i686 --- diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog index 9c0fab0db432..7e6bc49d9433 100644 --- a/www-client/chromium-bin/ChangeLog +++ b/www-client/chromium-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.58 2010/02/11 17:01:59 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.59 2010/03/01 10:30:21 phajdan.jr Exp $ + + 01 Mar 2010; Pawel Hajdan jr + chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild: + Add check for $ROOT in the /dev/shm sanity check wrt latest comments in + bug #299777. 11 Feb 2010; Bernard Cafarelli chromium-bin-4.0.295.0_p35884.ebuild, diff --git a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild index d92864dd62fd..8a3b2c4cf62b 100644 --- a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild +++ b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="2" inherit eutils multilib portability @@ -46,24 +46,26 @@ QA_TEXTRELS="opt/chromium.org/chrome-linux/libffmpegsumo.so" QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libffmpegsumo.so" pkg_setup() { - # Built with SSE2 enabled, so will fail on older processors - if [[ ${ROOT} == "/" ]] && ! grep -q sse2 /proc/cpuinfo; then - die "This binary requires SSE2 support, it will not work on older processors" - fi - - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" + if [[ "${ROOT}" == "/" ]]; then + # Built with SSE2 enabled, so will fail on older processors + if ! grep -q sse2 /proc/cpuinfo; then + die "This binary requires SSE2 support, it will not work on older processors" + fi + + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi fi } diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild index f72e27cb2976..efe43eedbc81 100644 --- a/www-client/chromium-bin/chromium-bin-9999.ebuild +++ b/www-client/chromium-bin/chromium-bin-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.34 2010/02/11 17:01:59 voyageur Exp $ +# $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 $ EAPI="2" inherit eutils multilib portability @@ -40,24 +40,26 @@ QA_TEXTRELS="opt/chromium.org/chrome-linux/libffmpegsumo.so" QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libffmpegsumo.so" pkg_setup() { - # Built with SSE2 enabled, so will fail on older processors - if [[ ${ROOT} == "/" ]] && ! grep -q sse2 /proc/cpuinfo; then - die "This binary requires SSE2 support, it will not work on older processors" - fi - - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" + if [[ "${ROOT}" == "/" ]]; then + # Built with SSE2 enabled, so will fail on older processors + if ! grep -q sse2 /proc/cpuinfo; then + die "This binary requires SSE2 support, it will not work on older processors" + fi + + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi fi } diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 9cbb2bce48cc..84b50f4408f5 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/chromium # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.61 2010/02/27 15:50:21 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.62 2010/03/01 10:26:59 phajdan.jr Exp $ + + 01 Mar 2010; Pawel Hajdan jr + chromium-5.0.307.11.ebuild, chromium-5.0.335.0.ebuild, + chromium-9999.ebuild: + Add check for $ROOT in the /dev/shm sanity check wrt latest comments in + bug #299777. *chromium-5.0.307.11 (27 Feb 2010) diff --git a/www-client/chromium/chromium-5.0.307.11.ebuild b/www-client/chromium/chromium-5.0.307.11.ebuild index 2f3eb21e79d5..b41c52caee15 100644 --- a/www-client/chromium/chromium-5.0.307.11.ebuild +++ b/www-client/chromium/chromium-5.0.307.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="2" inherit eutils flag-o-matic multilib portability toolchain-funcs @@ -41,19 +41,21 @@ DEPEND="${RDEPEND} sys-devel/flex" pkg_setup() { - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" + if [[ "${ROOT}" == "/" ]]; then + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi fi elog "${PN} might crash occasionally. To get more useful backtraces" diff --git a/www-client/chromium/chromium-5.0.335.0.ebuild b/www-client/chromium/chromium-5.0.335.0.ebuild index 62cb9f2c9a90..3b14c08e20c7 100644 --- a/www-client/chromium/chromium-5.0.335.0.ebuild +++ b/www-client/chromium/chromium-5.0.335.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="2" inherit eutils flag-o-matic multilib portability toolchain-funcs @@ -41,19 +41,21 @@ DEPEND="${RDEPEND} sys-devel/flex" pkg_setup() { - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" + if [[ "${ROOT}" == "/" ]]; then + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi fi elog "${PN} might crash occasionally. To get more useful backtraces" diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index 2b83a69c353a..59dc39ed4ed0 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.30 2010/02/23 18:26:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.31 2010/03/01 10:26:59 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability subversion toolchain-funcs @@ -42,19 +42,21 @@ DEPEND="${RDEPEND} sys-devel/flex" pkg_setup() { - # Prevent user problems like bug 299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - eerror "You don't have tmpfs mounted at /dev/shm." - eerror "${PN} isn't going to work in that configuration." - eerror "Please uncomment the /dev/shm entry in /etc/fstab," - eerror "run 'mount /dev/shm' and try again." - die "/dev/shm is not mounted" - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - eerror "/dev/shm does not have correct permissions." - eerror "${PN} isn't going to work in that configuration." - eerror "Please run chmod 1777 /dev/shm and try again." - die "/dev/shm has incorrect permissions" + if [[ "${ROOT}" == "/" ]]; then + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi fi elog "${PN} might crash occasionally. To get more useful backtraces"