46 |
46 |
47 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
47 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
48 |
48 |
49 # Since this is an app, and doesn't provide any public library interfaces, we |
49 # Since this is an app, and doesn't provide any public library interfaces, we |
50 # only need to deliver one version. The manifest is parameterized, though. |
50 # only need to deliver one version. The manifest is parameterized, though. |
51 PYTHON_VERSIONS= 2.6 |
51 PYTHON_VERSIONS= 2.7 |
52 |
52 |
53 PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION) |
53 PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION) |
54 PKG_MACROS += PYVER=$(PYTHON_VERSIONS) |
54 PKG_MACROS += PYVER=$(PYTHON_VERSIONS) |
55 PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .) |
55 PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .) |
56 |
56 |
70 files/cinder-volume.xml \ |
70 files/cinder-volume.xml \ |
71 $(PROTO_DIR)/lib/svc/manifest/application/openstack; \ |
71 $(PROTO_DIR)/lib/svc/manifest/application/openstack; \ |
72 $(CP) \ |
72 $(CP) \ |
73 files/solaris/solarisfc.py \ |
73 files/solaris/solarisfc.py \ |
74 files/solaris/solarisiscsi.py \ |
74 files/solaris/solarisiscsi.py \ |
75 $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/brick/initiator; \ |
75 $(PROTO_DIR)$(PYTHON_LIB)/cinder/brick/initiator; \ |
76 $(MKDIR) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/solaris; \ |
76 $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris; \ |
77 $(TOUCH) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/solaris/__init__.py; \ |
77 $(TOUCH) $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris/__init__.py; \ |
78 $(CP) files/solaris/zfs.py $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/solaris; \ |
78 $(CP) files/solaris/zfs.py $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris; \ |
79 $(MKDIR) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/zfssa; \ |
79 $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/zfssa; \ |
80 $(CP) files/zfssa/cinder.akwf $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/zfssa); \ |
80 $(CP) files/zfssa/cinder.akwf $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/zfssa); \ |
81 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES) |
81 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES) |
82 |
82 |
83 # common targets |
83 # common targets |
84 build: $(BUILD_NO_ARCH) |
84 build: $(BUILD_NO_ARCH) |
85 |
85 |
87 |
87 |
88 test: $(NO_TESTS) |
88 test: $(NO_TESTS) |
89 |
89 |
90 |
90 |
91 REQUIRED_PACKAGES += cloud/openstack/openstack-common |
91 REQUIRED_PACKAGES += cloud/openstack/openstack-common |
92 REQUIRED_PACKAGES += library/python/eventlet-26 |
92 REQUIRED_PACKAGES += library/python/eventlet-27 |
93 REQUIRED_PACKAGES += library/python/iniparse-26 |
93 REQUIRED_PACKAGES += library/python/iniparse-27 |
94 REQUIRED_PACKAGES += library/python/ipython-26 |
94 REQUIRED_PACKAGES += library/python/ipython-27 |
95 REQUIRED_PACKAGES += library/python/oslo.config-26 |
95 REQUIRED_PACKAGES += library/python/oslo.config-27 |
96 REQUIRED_PACKAGES += library/python/python-mysql-26 |
96 REQUIRED_PACKAGES += library/python/python-mysql-27 |
97 REQUIRED_PACKAGES += library/python/sqlalchemy-26 |
97 REQUIRED_PACKAGES += library/python/sqlalchemy-27 |
98 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 |
98 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27 |
99 REQUIRED_PACKAGES += system/core-os |
99 REQUIRED_PACKAGES += system/core-os |
100 REQUIRED_PACKAGES += system/file-system/zfs |
100 REQUIRED_PACKAGES += system/file-system/zfs |
101 REQUIRED_PACKAGES += system/storage/fc-utilities |
101 REQUIRED_PACKAGES += system/storage/fc-utilities |
102 REQUIRED_PACKAGES += system/storage/iscsi/iscsi-target |
102 REQUIRED_PACKAGES += system/storage/iscsi/iscsi-target |
103 REQUIRED_PACKAGES += system/storage/scsi-target-mode-framework |
103 REQUIRED_PACKAGES += system/storage/scsi-target-mode-framework |