[profiles] Add openib stuff to profiles

7 files changed, 34 insertions, 16 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 803f2f6ca50f..0ce0381f3bb7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5491 2011/06/30 19:15:45 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5492 2011/06/30 20:46:33 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!
 
+  30 Jun 2011; Alexey Shvetsov <alexxy@gentoo.org> +desc/openib_drivers.desc,
+  base/ChangeLog, base/make.defaults, base/package.use.mask, categories,
+  use.desc:
+  Add OPENIB_DRIVERS to USE_EXPAND and its descriptins. Add infiniband use flag
+  to global one since many packages can use it
+
   30 Jun 2011; Anthony G. Basile <blueness@gentoo.org> hardened/linux/use.mask:
   Use masked opencl on hardened, bug #367225
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 74804b84d49b..8b8ef1de375c 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.277 2011/06/19 03:38:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.278 2011/06/30 20:46:34 alexxy Exp $
+
+  30 Jun 2011; Alexey Shvetsov <alexxy@gentoo.org> make.defaults,
+  package.use.mask:
+  Also unmask infiniband use flag
+
+  30 Jun 2011; Alexey Shvetsov <alexxy@gentoo.org> make.defaults:
+  Add OPENIB_DRIVERS to USE_EXPAND
 
   19 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask:
   Remove glade use-mask, it's been added to the tree
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 5471c21b1713..270e806a7d55 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.66 2011/05/16 08:51:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.67 2011/06/30 20:46:34 alexxy Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OPENIB_DRIVERS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index fa157e95ba77..758d53c02cf2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.246 2011/06/23 15:53:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.247 2011/06/30 20:46:34 alexxy Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -122,10 +122,6 @@ dev-lang/ruby-enterprise fastthreading
 # Mask clutter till introspection is unmasked
 =gnome-extra/gnome-games-2.3* clutter
 
-# Kacper Kowalik <xarthisius@gentoo.org> (26 Jun 2010)
-# Mask infiniband until we've libibverbs and librdmacm with pc file
-sys-cluster/corosync infiniband
-
 # Nirbheek Chauhan <nirbheek@gentoo.org> (26 Jun 2010)
 # Inter-process communication doesn't work on anything except x86/amd64/arm
 # due to lack of atomic ops, bug 325185
@@ -175,12 +171,6 @@ sci-chemistry/gamess mpi
 <kde-base/kdeutils-meta-4.5.0 cups
 <kde-base/plasma-workspace-4.5.0 google-gadgets
 
-# Alexey Shvetsov <alexxy@gentoo.org> (25 Nov 2009)
-# mask infiniband use flag for some packages since infiniband software
-# still not in portage. All needed libs available via science overlay
-sys-cluster/glusterfs infiniband
-sys-block/tgt infiniband
-
 # Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
 # Mask cuda for k3d. Works only on amd64/x86. Bug 267264
 media-gfx/k3d cuda
diff --git a/profiles/categories b/profiles/categories
index 50f025657714..2d4d95a31564 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -129,6 +129,7 @@ sys-cluster
 sys-devel
 sys-freebsd
 sys-fs
+sys-infiniband
 sys-kernel
 sys-libs
 sys-power
diff --git a/profiles/desc/openib_drivers.desc b/profiles/desc/openib_drivers.desc
new file mode 100644
index 000000000000..e0b3928c1212
--- /dev/null
+++ b/profiles/desc/openib_drivers.desc
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/openib_drivers.desc,v 1.1 2011/06/30 20:46:34 alexxy Exp $
+
+# This file contains descriptions of OPENIB_DRIVERS USE_EXPAND flags.
+
+# Keep it sorted.
+
+cxgb3 - Chelsio T3 RNIC driver
+ehca - IBM InfiniBand HCA (ehca) driver
+mlx4 - Mellanox ConnectX InfiniBand HCA driver
+mthca - Mellanox InfiniBand HCA driver
+nes - NetEffect Ethernet Server Cluster Adapter driver
diff --git a/profiles/use.desc b/profiles/use.desc
index d237b1afa94f..67c557498936 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.460 2011/05/09 19:43:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.461 2011/06/30 20:46:33 alexxy Exp $
 
 # Keep them sorted
 
@@ -157,6 +157,7 @@ ieee1394 - Enable FireWire/iLink IEEE1394 support (dv, camera, ...)
 imagemagick - Enables support for Imagemagick (image converter)
 imap - Adds support for IMAP (Internet Mail Application Protocol)
 imlib - Adds support for imlib, an image loading and rendering library
+infiniband - Enable Infiniband RDMA transport support
 inifile - Adds dbm support for .ini files
 innodb - Adds innodb support for mySQL (transaction support)
 interbase - Adds support for Interbase database