--- a/components/openvswitch/Makefile	Thu Feb 02 15:16:38 2017 -0800
+++ b/components/openvswitch/Makefile	Thu Feb 02 17:07:46 2017 -0800
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # parfait fails to compile us (22221056)
@@ -47,6 +47,8 @@
 PUBLISH_STAMP=
 endif
 
+PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+
 include $(WS_MAKE_RULES)/common.mk
 
 PKG_PROTO_DIRS += $(BUILD_DIR_64)

--- a/components/openvswitch/openvswitch.p5m	Thu Feb 02 15:16:38 2017 -0800
+++ b/components/openvswitch/openvswitch.p5m	Thu Feb 02 17:07:46 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -36,7 +36,9 @@
 set name=com.oracle.info.description \
     value="portions of the Open vSwitch (OVS) software."
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value=org.opensolaris.category.2008:System/Services
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Services \
+    value=org.opensolaris.category.2008:System/Virtualization
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2015/311

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openvswitch/ovs-python-PYVER.p5m	Thu Feb 02 17:07:46 2017 -0800
@@ -0,0 +1,75 @@
+#
+# 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) 2017, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr/lib/python$(PYVER)/vendor-packages/ovs/(.*) -> set action.hash usr/lib/ovs/share/openvswitch/python/ovs/%<1> >
+<transform file path=.*\.py$ -> default pkg.tmp.autopyc false>
+set name=pkg.fmri \
+    value=pkg:/library/python/ovs-$(PYV)@$(COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for Open Virtual Switch"
+set name=com.oracle.info.description \
+    value="the Python bindings for Open Virtual Switch"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Services \
+    value=org.opensolaris.category.2008:System/Virtualization
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2015/311 value=PSARC/2017/007
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/daemon.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/data.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/error.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/idl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/parser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/schema.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/db/types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/dirs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/fatal_signal.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/json.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/jsonrpc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/ovsuuid.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/poller.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/process.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/reconnect.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/socket_util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/stream.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/timeval.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/unixctl/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/unixctl/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/unixctl/server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ovs/vlog.py
+license openvswitch.license license="openvswitch license"
+# force a dependency on the Python $(PYVER) runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+# force a dependency on the ovs package
+depend type=require \
+    fmri=library/python/ovs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+depend type=require fmri=service/network/openvswitch