--- a/components/openstack/cloudbase-init/Makefile Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/cloudbase-init/Makefile Mon Jun 13 23:38:24 2016 -0700
@@ -28,11 +28,12 @@
COMPONENT_NAME= cloudbase-init
COMPONENT_VERSION= 0.9.9
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE= $(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:0385c905952132ce944c821ea4f57ccffd660db7965ca8a62f28600939e659c1
-COMPONENT_ARCHIVE_URL= https://github.com/openstack/cloudbase-init/archive/0.9.9.tar.gz
+COMPONENT_ARCHIVE_URL= \
+ https://github.com/openstack/cloudbase-init/archive/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= https://github.com/stackforge/cloudbase-init
COMPONENT_BUGDB= service/cloudbase-init
@@ -52,7 +53,7 @@
# Copy the PKG-INFO file to the build root
COMPONENT_PRE_BUILD_ACTION = \
- $(CP) $(COMPONENT_DIR)/PKG-INFO $(SOURCE_DIR)
+ $(CP) $(COMPONENT_DIR)/PKG-INFO $(SOURCE_DIR)
# common targets
build: $(BUILD_NO_ARCH)
--- a/components/openstack/cloudbase-init/cloudbase-init.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/cloudbase-init/cloudbase-init.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -38,6 +38,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2016/010
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
file files/cloudbase-init.conf path=etc/cloudbase-init.conf
file files/cloudbase-init.xml \
path=lib/svc/manifest/application/cloudbase-init.xml
@@ -145,23 +146,10 @@
#
license LICENSE license="Apache v2.0"
-# force a group dependency on the optional netaddr; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/netaddr-$(PYV)
-
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/babel-$(PYV)
-
-# force a dependency on eventlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/eventlet-$(PYV)
-
-# force a dependency on iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/iso8601-$(PYV)
-
# force a dependency on netifaces; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/netifaces-$(PYV)
-# force a dependency on oauth; pkgdepend work is needed to flush this out.
+# force a dependency on oauthlib; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oauthlib-$(PYV)
# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
@@ -170,9 +158,14 @@
# force a dependency on oslo.log; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.log-$(PYV)
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pyyaml-$(PYV)
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
-
--- a/components/openstack/cloudbase-init/patches/requirements.txt.patch Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/cloudbase-init/patches/requirements.txt.patch Mon Jun 13 23:38:24 2016 -0700
@@ -1,15 +1,38 @@
-Remove platform dependency expressions that require PEP426 support we don't
-have yet. Not suitable for upstream.
+In-house patch to remove unnecessary dependencies from cloudbase-init's
+requirements file. The specific reasons are as follows:
+
+Babel Not applicable
+
+eventlet Not applicable
+
+netaddr Not applicable
+
+pbr Downgrade to 0.8.1 or greater
+
+pyserial Not applicable
+
+comtypes Not applicable to Solaris (and lack of PEP 426 support)
+
+pywin32 Not applicable to Solaris (and lack of PEP 426 support)
---- ORIGINAL/requirements.txt 2015-12-29 14:23:49.000000000 -0800
-+++ cloudbase-init-0.9.9/requirements.txt 2015-12-30 08:13:34.146913324 -0800
-@@ -1,4 +1,4 @@
+tzlocal Not applicable to Solaris (and lack of PEP 426 support)
+
+wmi Not applicable to Solaris (and lack of PEP 426 support)
+
+--- cloudbase-init-0.9.9/requirements.txt.~1~ 2015-10-19 06:33:52.000000000 -0700
++++ cloudbase-init-0.9.9/requirements.txt 2016-04-04 19:51:53.527105713 -0700
+@@ -1,17 +1,8 @@
-pbr>=1.3
+-iso8601
+-eventlet
+-netaddr>=0.7.6
+-pyserial
+pbr>=0.8.1
- iso8601
- eventlet
- netaddr>=0.7.6
-@@ -11,7 +11,3 @@
+ oslo.config
+ oslo.log
+ six>=1.7.0
+-Babel>=1.3
+ oauthlib
netifaces
PyYAML
requests
--- a/components/openstack/cloudbase-init/patches/setup.py.pbr.patch Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/cloudbase-init/patches/setup.py.pbr.patch Mon Jun 13 23:38:24 2016 -0700
@@ -1,9 +1,9 @@
Patch to downrev the required version of pbr to something we have.
This patch is not suitable for upstream commitment.
---- cloudbase-init-0.9.7/setup.py.orig 2014-12-22 09:21:29.644355381 -0700
-+++ cloudbase-init-0.9.7/setup.py 2014-12-22 09:21:38.592302541 -0700
-@@ -17,5 +17,5 @@
+--- cloudbase-init-0.9.9/setup.py.~1~ 2015-10-19 06:33:52.000000000 -0700
++++ cloudbase-init-0.9.9/setup.py 2016-04-04 19:44:44.173519286 -0700
+@@ -15,5 +15,5 @@
import setuptools
setuptools.setup(