6881494 Move SUNWdladmint files to existing packages for SFW TRILL build

16 files changed, 20 insertions, 255 deletions

diff --git a/usr/src/lib/libdladm/common/libdlbridge.c b/usr/src/lib/libdladm/common/libdlbridge.c
index 6b432b5560..5ad371ae93 100644
--- a/usr/src/lib/libdladm/common/libdlbridge.c
+++ b/usr/src/lib/libdladm/common/libdlbridge.c
@@ -43,6 +43,7 @@
 #include <net/bridge.h>
 #include <net/trill.h>
 #include <sys/socket.h>
+#include <sys/dld_ioc.h>
 
 /*
  * Bridge Administration Library.
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index 74599be617..90f282d525 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -234,7 +234,6 @@ COMMON_SUBDIRS= \
 	SUNWdhcsb  \
 	SUNWdhcsr  \
 	SUNWdhcsu  \
-	SUNWdladmint \
 	SUNWdmfe \
 	SUNWdmgtr \
 	SUNWdmgtu \
diff --git a/usr/src/pkgdefs/SUNWarcr/prototype_com b/usr/src/pkgdefs/SUNWarcr/prototype_com
index 852330d742..114064c808 100644
--- a/usr/src/pkgdefs/SUNWarcr/prototype_com
+++ b/usr/src/pkgdefs/SUNWarcr/prototype_com
@@ -68,6 +68,8 @@ f none lib/llib-ldevinfo 644 root bin
 f none lib/llib-ldevinfo.ln 644 root bin
 f none lib/llib-ldl 644 root bin
 f none lib/llib-ldl.ln 644 root bin
+f none lib/llib-ldladm 644 root bin
+f none lib/llib-ldladm.ln 644 root bin
 f none lib/llib-ldlpi 644 root bin
 f none lib/llib-ldlpi.ln 644 root bin
 f none lib/llib-ldoor 644 root bin
diff --git a/usr/src/pkgdefs/SUNWarcr/prototype_i386 b/usr/src/pkgdefs/SUNWarcr/prototype_i386
index b1070ea2ac..d0d0d12cea 100644
--- a/usr/src/pkgdefs/SUNWarcr/prototype_i386
+++ b/usr/src/pkgdefs/SUNWarcr/prototype_i386
@@ -62,6 +62,7 @@ f none lib/amd64/llib-ldevice.ln 644 root bin
 f none lib/amd64/llib-ldevid.ln 644 root bin
 f none lib/amd64/llib-ldevinfo.ln 644 root bin
 f none lib/amd64/llib-ldl.ln 644 root bin
+f none lib/amd64/llib-ldladm.ln 644 root bin
 f none lib/amd64/llib-ldlpi.ln 644 root bin
 f none lib/amd64/llib-ldoor.ln 644 root  bin
 f none lib/amd64/llib-lefi.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWarcr/prototype_sparc b/usr/src/pkgdefs/SUNWarcr/prototype_sparc
index cb88b653df..1485172b90 100644
--- a/usr/src/pkgdefs/SUNWarcr/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWarcr/prototype_sparc
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -62,6 +62,7 @@ f none lib/sparcv9/llib-ldevice.ln 644 root bin
 f none lib/sparcv9/llib-ldevid.ln 644 root bin
 f none lib/sparcv9/llib-ldevinfo.ln 644 root bin
 f none lib/sparcv9/llib-ldl.ln 644 root bin
+f none lib/sparcv9/llib-ldladm.ln 644 root bin
 f none lib/sparcv9/llib-ldlpi.ln 644 root bin
 f none lib/sparcv9/llib-ldoor.ln 644 root  bin
 f none lib/sparcv9/llib-lefi.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWcslr/prototype_com b/usr/src/pkgdefs/SUNWcslr/prototype_com
index 26bfb79b0f..78c3e7ad2b 100644
--- a/usr/src/pkgdefs/SUNWcslr/prototype_com
+++ b/usr/src/pkgdefs/SUNWcslr/prototype_com
@@ -77,6 +77,7 @@ f none lib/libdhcpagent.so.1 755 root bin
 f none lib/libdhcputil.so.1 755 root bin
 s none lib/libdl.so=libdl.so.1
 f none lib/libdl.so.1 755 root bin
+s none lib/libdladm.so=libdladm.so.1
 f none lib/libdladm.so.1 755 root bin
 f none lib/libdlpi.so.1 755 root bin
 s none lib/libdlpi.so=libdlpi.so.1
diff --git a/usr/src/pkgdefs/SUNWcslr/prototype_i386 b/usr/src/pkgdefs/SUNWcslr/prototype_i386
index f43e6202ad..7117f20e05 100644
--- a/usr/src/pkgdefs/SUNWcslr/prototype_i386
+++ b/usr/src/pkgdefs/SUNWcslr/prototype_i386
@@ -74,6 +74,7 @@ s none lib/amd64/libdevinfo.so=libdevinfo.so.1
 f none lib/amd64/libdevinfo.so.1 755 root bin
 s none lib/amd64/libdl.so=libdl.so.1
 f none lib/amd64/libdl.so.1 755 root bin
+s none lib/amd64/libdladm.so=libdladm.so.1
 f none lib/amd64/libdladm.so.1 755 root bin
 s none lib/amd64/libdlpi.so=libdlpi.so.1
 f none lib/amd64/libdlpi.so.1 755 root bin
diff --git a/usr/src/pkgdefs/SUNWcslr/prototype_sparc b/usr/src/pkgdefs/SUNWcslr/prototype_sparc
index 259a053395..b9f96deee2 100644
--- a/usr/src/pkgdefs/SUNWcslr/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWcslr/prototype_sparc
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This required package information file contains a list of package contents.
@@ -82,6 +82,7 @@ s none lib/sparcv9/libdevinfo.so=libdevinfo.so.1
 f none lib/sparcv9/libdevinfo.so.1 755 root bin
 s none lib/sparcv9/libdl.so=libdl.so.1
 f none lib/sparcv9/libdl.so.1 755 root bin
+s none lib/sparcv9/libdladm.so=libdladm.so.1
 f none lib/sparcv9/libdladm.so.1 755 root bin
 s none lib/sparcv9/libdlpi.so=libdlpi.so.1
 f none lib/sparcv9/libdlpi.so.1 755 root bin
diff --git a/usr/src/pkgdefs/SUNWdladmint/Makefile b/usr/src/pkgdefs/SUNWdladmint/Makefile
deleted file mode 100644
index 315bf62591..0000000000
--- a/usr/src/pkgdefs/SUNWdladmint/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-DATAFILES += depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-
-install: all pkg
-
-include ../Makefile.targ
diff --git a/usr/src/pkgdefs/SUNWdladmint/pkginfo.tmpl b/usr/src/pkgdefs/SUNWdladmint/pkginfo.tmpl
deleted file mode 100644
index d1098cf7e3..0000000000
--- a/usr/src/pkgdefs/SUNWdladmint/pkginfo.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWdladmint"
-NAME="Datalink Administration Internal Files"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Datalink administration internal files"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/usr/src/pkgdefs/SUNWdladmint/prototype_com b/usr/src/pkgdefs/SUNWdladmint/prototype_com
deleted file mode 100644
index a26a671f24..0000000000
--- a/usr/src/pkgdefs/SUNWdladmint/prototype_com
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-#
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWdladmint
-#
-d none usr 755 root sys
-d none usr/include 755 root bin
-f none usr/include/libdladm.h 644 root bin
-f none usr/include/libdllink.h 644 root bin
-f none usr/include/libdlvlan.h 644 root bin
-f none usr/include/libdlbridge.h 644 root bin
-f none usr/include/uid_stp.h 644 root bin
-d none usr/include/sys 755 root bin
-f none usr/include/sys/dld.h 644 root bin
-f none usr/include/sys/dls_mgmt.h 644 root bin
-f none usr/include/sys/mac.h 644 root bin
-f none usr/include/sys/mac_flow.h 644 root bin
-d none lib 755 root bin
-s none lib/libdladm.so=./libdladm.so.1
-f none lib/llib-ldladm 644 root bin
-f none lib/llib-ldladm.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWdladmint/prototype_i386 b/usr/src/pkgdefs/SUNWdladmint/prototype_i386
deleted file mode 100644
index f19e33b065..0000000000
--- a/usr/src/pkgdefs/SUNWdladmint/prototype_i386
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-#
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files that are i386 specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWdladmint
-#
-d none lib/amd64 755 root bin
-s none lib/amd64/libdladm.so=./libdladm.so.1
-f none lib/amd64/llib-ldladm.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWdladmint/prototype_sparc b/usr/src/pkgdefs/SUNWdladmint/prototype_sparc
deleted file mode 100644
index a830eeb4df..0000000000
--- a/usr/src/pkgdefs/SUNWdladmint/prototype_sparc
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# 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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-#
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files that are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWdladmint
-#
-d none lib/sparcv9 755 root bin
-s none lib/sparcv9/libdladm.so=./libdladm.so.1
-f none lib/sparcv9/llib-ldladm.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com
index 47b32ddde2..f8e18385d1 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_com
+++ b/usr/src/pkgdefs/SUNWhea/prototype_com
@@ -299,7 +299,11 @@ f none usr/include/libcontract.h 644 root bin
 f none usr/include/libctf.h 644 root bin
 f none usr/include/libdevinfo.h 644 root bin
 f none usr/include/libdevice.h 644 root bin
+f none usr/include/libdladm.h 644 root bin
+f none usr/include/libdlbridge.h 644 root bin
+f none usr/include/libdllink.h 644 root bin
 f none usr/include/libdlpi.h 644 root bin
+f none usr/include/libdlvlan.h 644 root bin
 f none usr/include/libelf.h 644 root bin
 f none usr/include/libfstyp.h 644 root bin
 f none usr/include/libfstyp_module.h 644 root bin
@@ -776,7 +780,9 @@ d none usr/include/sys/dktp 755 root bin
 f none usr/include/sys/dktp/dadkio.h 644 root bin
 f none usr/include/sys/dktp/fdisk.h 644 root bin
 f none usr/include/sys/dl.h 644 root bin
+f none usr/include/sys/dld.h 644 root bin
 f none usr/include/sys/dlpi.h 644 root bin
+f none usr/include/sys/dls_mgmt.h 644 root bin
 f none usr/include/sys/dma_i8237A.h 644 root bin
 f none usr/include/sys/door.h 644 root bin
 f none usr/include/sys/door_data.h 644 root bin
@@ -1031,6 +1037,8 @@ f none usr/include/sys/lvm/mdvar.h 644 root bin
 f none usr/include/sys/lwp.h 644 root bin
 f none usr/include/sys/lwp_timer_impl.h 644 root bin
 f none usr/include/sys/lwp_upimutex_impl.h 644 root bin
+f none usr/include/sys/mac.h 644 root bin
+f none usr/include/sys/mac_flow.h 644 root bin
 f none usr/include/sys/machelf.h 644 root bin
 f none usr/include/sys/machlock.h 644 root bin
 f none usr/include/sys/machsig.h 644 root bin
@@ -1415,6 +1423,7 @@ f none usr/include/tsol/label.h 644 root bin
 f none usr/include/tzfile.h 644 root bin
 f none usr/include/ucontext.h 644 root bin
 f none usr/include/ucred.h 644 root bin
+f none usr/include/uid_stp.h 644 root bin
 f none usr/include/user_attr.h 644 root bin
 f none usr/include/ulimit.h 644 root bin
 f none usr/include/umem.h 644 root bin
diff --git a/usr/src/uts/common/io/bridge.c b/usr/src/uts/common/io/bridge.c
index eceb06540b..beb0bdd2f1 100644
--- a/usr/src/uts/common/io/bridge.c
+++ b/usr/src/uts/common/io/bridge.c
@@ -60,6 +60,7 @@
 #include <net/bridge.h>
 #include <net/bridge_impl.h>
 #include <net/trill.h>
+#include <sys/dld_ioc.h>
 
 /*
  * Locks and reference counts: object lifetime and design.
diff --git a/usr/src/uts/common/net/bridge.h b/usr/src/uts/common/net/bridge.h
index 47249a36f5..c1df72eb86 100644
--- a/usr/src/uts/common/net/bridge.h
+++ b/usr/src/uts/common/net/bridge.h
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/dld.h>
-#include <sys/dld_ioc.h>
 #include <sys/ethernet.h>
 
 #ifdef __cplusplus