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 |
80 # testscenarios, sphinx and oslo.sphinx some of which have not yet |
80 # testscenarios, sphinx and oslo.sphinx some of which have not yet |
81 # integrated |
81 # integrated |
82 test: $(NO_TESTS) |
82 test: $(NO_TESTS) |
83 |
83 |
84 |
84 |
85 REQUIRED_PACKAGES += library/python/eventlet-26 |
85 REQUIRED_PACKAGES += library/python/eventlet-27 |
86 REQUIRED_PACKAGES += library/python/iniparse-26 |
86 REQUIRED_PACKAGES += library/python/iniparse-27 |
87 REQUIRED_PACKAGES += library/python/oslo.config-26 |
87 REQUIRED_PACKAGES += library/python/oslo.config-27 |
88 REQUIRED_PACKAGES += library/python/python-mysql-26 |
88 REQUIRED_PACKAGES += library/python/python-mysql-27 |
89 REQUIRED_PACKAGES += library/python/setuptools-26 |
89 REQUIRED_PACKAGES += library/python/setuptools-27 |
90 REQUIRED_PACKAGES += library/python/six-26 |
90 REQUIRED_PACKAGES += library/python/six-27 |
91 REQUIRED_PACKAGES += library/python/sqlalchemy-26 |
91 REQUIRED_PACKAGES += library/python/sqlalchemy-27 |
92 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 |
92 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27 |
93 REQUIRED_PACKAGES += shell/bash |
93 REQUIRED_PACKAGES += shell/bash |
94 REQUIRED_PACKAGES += system/core-os |
94 REQUIRED_PACKAGES += system/core-os |