summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2014-04-08 09:43:46 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2014-04-08 09:43:46 +0000
commitb49f9c9429483974271069f86e2f56bd20c6cc15 (patch)
tree2540368e7205e5abe9d79b124ebc771fcdef0495 /profiles
parentStable for ppc64, wrt bug #507074 (diff)
downloadgentoo-2-b49f9c9429483974271069f86e2f56bd20c6cc15.tar.gz
gentoo-2-b49f9c9429483974271069f86e2f56bd20c6cc15.tar.bz2
gentoo-2-b49f9c9429483974271069f86e2f56bd20c6cc15.zip
Add udcm desc. And mask cuda on all arches and unmask it for target ones only
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog12
-rw-r--r--profiles/arch/amd64/use.mask6
-rw-r--r--profiles/arch/x86/use.mask6
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/use.mask5
-rw-r--r--profiles/desc/openmpi_ofed_features.desc5
6 files changed, 32 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 4e9d35c9d1be..e2a2e997a354 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,21 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8791 2014/04/06 15:57:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8792 2014/04/08 09:43:45 alexxy Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 08 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> arch/amd64/use.mask,
+ arch/x86/use.mask, base/ChangeLog, base/use.mask,
+ desc/openmpi_ofed_features.desc:
+ Add udcm desk
+
+ 08 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> arch/amd64/use.mask,
+ arch/x86/use.mask, base/ChangeLog, base/use.mask:
+ CUDA only available on x86 and amd64 so mask it globaly and unmask only on
+ target arches
+
06 Apr 2014; Markos Chandras <hwoarang@gentoo.org> package.mask:
Mask openocd-0.8.0_rc* releases for testing
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index c7de89b22c7b..1ea10e89c75e 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,12 +1,16 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.59 2014/03/30 21:38:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.60 2014/04/08 09:43:46 alexxy Exp $
# Unmask the flag which corresponds to ARCH.
-amd64
# SECTION: Unmask
+# Alexey Shvetsov <alexxy@gentoo.org> (08 Apr 2014)
+# Cuda works here
+-cuda
+
# Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
# PyPy is keyworded on this arch.
-python_targets_pypy
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index a9c4a77e71fe..262762424658 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,10 +1,14 @@
# Copyright 1999-2014 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.60 2014/03/30 21:38:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.61 2014/04/08 09:43:46 alexxy Exp $
# Unmask the flag which corresponds to ARCH.
-x86
+# Alexey Shvetsov <alexxy@gentoo.org> (08 Apr 2014)
+# Cuda works here
+-cuda
+
# Michał Górny <mgorny@gentoo.org> (30 Mar 2014)
# PyPy is keyworded on this arch.
-python_targets_pypy
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index f4049315c354..0109c41dfd3e 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.669 2014/04/06 16:56:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.670 2014/04/08 09:43:46 alexxy Exp $
+
+ 08 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> use.mask:
+ Mask cuda globaly
06 Apr 2014; Michał Górny <mgorny@gentoo.org> package.use.mask:
Mask USE=pypy for sys-apps/portage, since pypy has limited KEYWORDS.
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d05cec066c2c..b71897828205 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.194 2014/04/01 06:52:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.195 2014/04/08 09:43:46 alexxy Exp $
+
+# cuda only works on amd64/x86
+cuda
# on the way out
ruby_targets_ruby18
diff --git a/profiles/desc/openmpi_ofed_features.desc b/profiles/desc/openmpi_ofed_features.desc
index 5d36dd71e35c..5e9c061b7e63 100644
--- a/profiles/desc/openmpi_ofed_features.desc
+++ b/profiles/desc/openmpi_ofed_features.desc
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/openmpi_ofed_features.desc,v 1.1 2012/04/18 20:26:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/openmpi_ofed_features.desc,v 1.2 2014/04/08 09:43:46 alexxy Exp $
# This file contains descriptions of OPENMPI_OFED_FEATURES USE_EXPAND flags.
@@ -9,5 +9,6 @@
control-hdr-padding - Add padding bytes to the openib control header
connectx-xrc - Enable ConnectX XRC support
rdmacm - Enable Open Fabrics RDMACM support in openib BTL
+udcm - Enable Open Fabrics UDCM support in openib BTL
dynamic-sl - Enable openib BTL to query Subnet Manager for IB SL
failover - enable openib BTL failover (for multiport adapters