6808773 code for Mellanox devices (hermon, tavor, udapl, fwflash) can become open source (fix export source build)

5 files changed, 119 insertions, 6 deletions

diff --git a/usr/src/Makefile b/usr/src/Makefile
index 637660661f..7089e5f85f 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -266,7 +266,6 @@ EXPORT_SRC:
 	@cd lib/sasl_plugins; pwd; $(MAKE) EXPORT_SRC
 	@cd $(CLOSED)/lib/smartcard;	  pwd; $(MAKE) EXPORT_SRC
 	@cd lib/pam_modules/krb5;   pwd; $(MAKE) EXPORT_SRC
-	@cd lib/udapl; pwd; $(MAKE) EXPORT_SRC
 	@cd lib/libresolv2; pwd; $(MAKE) EXPORT_SRC
 	@cd psm/stand/boot; pwd; $(MAKE) EXPORT_SRC
 	@cd uts/common/crypto/io; pwd; $(MAKE) EXPORT_SRC
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index 9bba588c6e..275298d808 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -132,6 +132,7 @@ COMMON_SUBDIRS=		\
 	dispadmin	\
 	dladm		\
 	dmesg		\
+	dodatadm	\
 	dtrace		\
 	du		\
 	dumpadm		\
@@ -463,7 +464,6 @@ COMMON_SUBDIRS=		\
 	ztest
 
 $(CLOSED_BUILD)COMMON_SUBDIRS += \
-	$(CLOSED)/cmd/dodatadm	\
 	$(CLOSED)/cmd/iconv	\
 	$(CLOSED)/cmd/ksh	\
 	$(CLOSED)/cmd/llc2	\
diff --git a/usr/src/cmd/dodatadm/Makefile b/usr/src/cmd/dodatadm/Makefile
new file mode 100644
index 0000000000..a04d4a0657
--- /dev/null
+++ b/usr/src/cmd/dodatadm/Makefile
@@ -0,0 +1,63 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# cmd/dodatadm/Makefile
+
+SCRIPT =	dodatadm.udaplt
+
+include $(SRC)/cmd/Makefile.cmd
+
+STARTDATADM= $(ROOTETC)/rc2.d/S81dodatadm.udaplt
+
+INITD= $(ROOTETC)/init.d
+RC2D= $(ROOTETC)/rc2.d
+DIRS= $(INITD) $(RC2D)
+
+FILEMODE= 0744
+OWNER= root
+GROUP= sys
+
+ETCINITPROG=	$(SCRIPT:%=$(INITD)/%)
+
+.KEEP_STATE:
+
+all: $(SCRIPT)
+
+install: all $(DIRS) $(ETCINITPROG) ln_PROG
+
+$(INITD)/% : % $(INITD)
+	$(INS.file)
+
+$(DIRS):
+	$(INS.dir)
+
+ln_PROG : $(ETCINITPROG)
+	-$(RM) $(STARTDATADM)
+	$(LN) $(INITD)/$(SCRIPT) $(STARTDATADM)
+
+clean:
+
+lint:
+
+include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/dodatadm/dodatadm.udaplt b/usr/src/cmd/dodatadm/dodatadm.udaplt
new file mode 100644
index 0000000000..77b506449a
--- /dev/null
+++ b/usr/src/cmd/dodatadm/dodatadm.udaplt
@@ -0,0 +1,51 @@
+#!/sbin/sh
+#
+# 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 2003 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# First read the /etc/dat/dat.conf file to see if it has already been
+# populated by the service provider entry. If so, simply return. If not,
+# run datadm to populate the dat.conf file
+if [ -r /etc/dat/dat.conf ]; then
+	pattern="driver_name="
+	[ `/usr/bin/grep -c "$pattern" /etc/dat/dat.conf` -ge 1 ] && exit 0
+else
+	echo "WARNING: /etc/dat/dat.conf is missing or unreadable" >& 2
+	exit 1
+fi
+
+# Now /etc/dat/dat.conf is readable but does not contain an entry for the
+# service provider. So, run datadm -a /usr/share/dat/SUNWudaplt.conf to 
+# populate dat.conf
+if [ -x /usr/sbin/datadm ]; then
+	if [ -r /usr/share/dat/SUNWudaplt.conf ]; then
+		/usr/sbin/datadm -a /usr/share/dat/SUNWudaplt.conf
+	else
+		echo "WARNING: SUNWudaplt.conf is missing or unreadable" >& 2
+		exit 1
+	fi
+else
+	echo "WARNING: /usr/sbin/datadm is missing or not executable" >& 2
+	exit 1	
+fi
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index 75eb967c7e..fdbce634cb 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -270,6 +270,7 @@ COMMON_SUBDIRS= \
 	SUNWhal \
 	SUNWhalr \
 	SUNWhea  \
+	SUNWhermon  \
 	SUNWhwdata \
 	SUNWhxge \
 	SUNWib \
@@ -473,6 +474,7 @@ COMMON_SUBDIRS= \
 	SUNWsshdu \
 	SUNWstmf \
 	SUNWstmfu \
+	SUNWtavor \
 	SUNWtcpd \
 	SUNWtcpdS \
 	SUNWtecla \
@@ -491,6 +493,8 @@ COMMON_SUBDIRS= \
 	SUNWuacm \
 	SUNWucbt \
 	SUNWudaplr \
+	SUNWudapltr \
+	SUNWudapltu \
 	SUNWudaplu \
 	SUNWudf \
 	SUNWudfr \
@@ -527,15 +531,11 @@ COMMON_SUBDIRS= \
 
 COMMON_XMODS= \
 	SUNWcryptoint \
-	SUNWhermon  \
 	SUNWibsdpib \
 	SUNWkdcr \
 	SUNWkdcu \
 	SUNWstatl \
 	SUNWsvvs \
-	SUNWtavor \
-	SUNWudapltr \
-	SUNWudapltu \
 	SUNWwbint \
 	SUNWwbsup