backout 25518625 - wrong branch s11-update
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Sat, 11 Feb 2017 09:23:57 -0800
branchs11-update
changeset 7663 380aba741284
parent 7660 942ce33da11a
child 7664 1b857bd3a87c
backout 25518625 - wrong branch
components/open-fabrics/libibverbs/Makefile
components/open-fabrics/libibverbs/llib-libverbs
components/open-fabrics/open-fabrics.p5m
--- a/components/open-fabrics/libibverbs/Makefile	Wed Feb 08 11:47:01 2017 -0800
+++ b/components/open-fabrics/libibverbs/Makefile	Sat Feb 11 09:23:57 2017 -0800
@@ -1,5 +1,24 @@
+
+# CDDL HEADER START
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -14,7 +33,6 @@
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include ../ofed.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
 
 MAN3FILES =	ibv_alloc_shpd.3 \
 		ibv_reg_mr_relaxed.3 \
--- a/components/open-fabrics/libibverbs/llib-libverbs	Wed Feb 08 11:47:01 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <infiniband/verbs.h>
--- a/components/open-fabrics/open-fabrics.p5m	Wed Feb 08 11:47:01 2017 -0800
+++ b/components/open-fabrics/open-fabrics.p5m	Sat Feb 11 09:23:57 2017 -0800
@@ -1,5 +1,24 @@
 #
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
@@ -104,7 +123,6 @@
 link path=usr/lib/$(MACH64)/librdmacm.so target=librdmacm.so.1.0.0
 link path=usr/lib/$(MACH64)/librdmacm.so.1 target=librdmacm.so.1.0.0
 file path=usr/lib/$(MACH64)/librdmacm.so.1.0.0
-file path=usr/lib/$(MACH64)/llib-libverbs.ln
 dir  path=usr/lib/amd64
 dir  path=usr/lib/ibdiagnet1.5.7
 file path=usr/lib/ibdiagnet1.5.7/git_version.tcl
@@ -175,8 +193,6 @@
 link path=usr/lib/librdmacm.so target=librdmacm.so.1.0.0
 link path=usr/lib/librdmacm.so.1 target=librdmacm.so.1.0.0
 file path=usr/lib/librdmacm.so.1.0.0
-file path=usr/lib/llib-libverbs
-file path=usr/lib/llib-libverbs.ln
 dir  path=usr/lib/secure
 dir  path=usr/lib/secure/$(MACH64)
 link path=usr/lib/secure/$(MACH64)/libsdp.so target=libsdp.so.1.0.0