equal
deleted
inserted
replaced
47 |
47 |
48 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
48 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
49 |
49 |
50 # Since this is an app, and doesn't provide any public library interfaces, we |
50 # Since this is an app, and doesn't provide any public library interfaces, we |
51 # only need to deliver one version. The manifest is parameterized, though. |
51 # only need to deliver one version. The manifest is parameterized, though. |
52 PYTHON_VERSIONS= 2.6 |
52 PYTHON_VERSIONS= 2.7 |
53 |
53 |
54 PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION) |
54 PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION) |
55 PKG_MACROS += PYVER=$(PYTHON_VERSIONS) |
55 PKG_MACROS += PYVER=$(PYTHON_VERSIONS) |
56 PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .) |
56 PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .) |
57 |
57 |
60 # |
60 # |
61 # All of the nova SMF manifests depend on nova-upgrade so copy it into |
61 # All of the nova SMF manifests depend on nova-upgrade so copy it into |
62 # the proto directory for pkgdepend(1) to find. |
62 # the proto directory for pkgdepend(1) to find. |
63 # |
63 # |
64 COMPONENT_POST_INSTALL_ACTION += \ |
64 COMPONENT_POST_INSTALL_ACTION += \ |
65 ($(CP) /dev/null $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/virt/libvirt/__init__.py; \ |
65 ($(CP) /dev/null $(PROTO_DIR)$(PYTHON_LIB)/nova/virt/libvirt/__init__.py; \ |
66 $(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \ |
66 $(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \ |
67 $(CP) \ |
67 $(CP) \ |
68 files/nova-api-ec2.xml \ |
68 files/nova-api-ec2.xml \ |
69 files/nova-api-metadata.xml \ |
69 files/nova-api-metadata.xml \ |
70 files/nova-api-osapi-compute.xml \ |
70 files/nova-api-osapi-compute.xml \ |
78 files/nova-upgrade.xml \ |
78 files/nova-upgrade.xml \ |
79 files/zone-vnc-console.xml \ |
79 files/zone-vnc-console.xml \ |
80 $(PROTO_DIR)/lib/svc/manifest/application/openstack; \ |
80 $(PROTO_DIR)/lib/svc/manifest/application/openstack; \ |
81 $(CP) \ |
81 $(CP) \ |
82 files/network/solaris_net.py \ |
82 files/network/solaris_net.py \ |
83 $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/network; \ |
83 $(PROTO_DIR)$(PYTHON_LIB)/nova/network; \ |
84 $(MKDIR) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/virt/solariszones; \ |
84 $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/nova/virt/solariszones; \ |
85 $(CP) \ |
85 $(CP) \ |
86 files/solariszones/__init__.py \ |
86 files/solariszones/__init__.py \ |
87 files/solariszones/driver.py \ |
87 files/solariszones/driver.py \ |
88 files/solariszones/sysconfig.py \ |
88 files/solariszones/sysconfig.py \ |
89 $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/virt/solariszones); \ |
89 $(PROTO_DIR)$(PYTHON_LIB)/nova/virt/solariszones); \ |
90 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES) |
90 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES) |
91 |
91 |
92 # common targets |
92 # common targets |
93 build: $(BUILD_NO_ARCH) |
93 build: $(BUILD_NO_ARCH) |
94 |
94 |
96 |
96 |
97 test: $(NO_TESTS) |
97 test: $(NO_TESTS) |
98 |
98 |
99 |
99 |
100 REQUIRED_PACKAGES += install/archive |
100 REQUIRED_PACKAGES += install/archive |
101 REQUIRED_PACKAGES += library/python/eventlet-26 |
101 REQUIRED_PACKAGES += library/python/eventlet-27 |
102 REQUIRED_PACKAGES += library/python/iniparse-26 |
102 REQUIRED_PACKAGES += library/python/iniparse-27 |
103 REQUIRED_PACKAGES += library/python/oslo.config-26 |
103 REQUIRED_PACKAGES += library/python/oslo.config-27 |
104 REQUIRED_PACKAGES += library/python/python-mysql-26 |
104 REQUIRED_PACKAGES += library/python/python-mysql-27 |
105 REQUIRED_PACKAGES += library/python/sqlalchemy-26 |
105 REQUIRED_PACKAGES += library/python/sqlalchemy-27 |
106 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 |
106 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27 |
107 REQUIRED_PACKAGES += library/python/webob-26 |
107 REQUIRED_PACKAGES += library/python/webob-27 |
108 REQUIRED_PACKAGES += service/network/evs |
108 REQUIRED_PACKAGES += service/network/evs |
109 REQUIRED_PACKAGES += system/core-os |
109 REQUIRED_PACKAGES += system/core-os |
110 REQUIRED_PACKAGES += system/file-system/zfs |
110 REQUIRED_PACKAGES += system/file-system/zfs |
111 REQUIRED_PACKAGES += system/library/storage/suri |
111 REQUIRED_PACKAGES += system/library/storage/suri |
112 REQUIRED_PACKAGES += system/storage/fc-utilities |
112 REQUIRED_PACKAGES += system/storage/fc-utilities |