diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-rally_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-rally_git.bb | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb index 31d42424..9327ff50 100644 --- a/meta-openstack/recipes-devtools/python/python-rally_git.bb +++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5" PR = "r0" SRCNAME = "rally" -SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master;protocol=https \ file://rally.init \ file://rally.conf \ file://task-example.json \ @@ -24,9 +24,9 @@ SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a" PV="git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools update-rc.d hosts identity default_configs +inherit setuptools3 update-rc.d hosts identity default_configs -do_install_append() { +do_install:append() { RALLY_CONF_DIR=${D}${sysconfdir}/${SRCNAME} RALLY_PYTHON_SITEPACKAGES_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME} @@ -62,7 +62,7 @@ do_install_append() { cp -r ${S}/tools ${RALLY_CONF_DIR} } -pkg_postinst_${SRCNAME}-setup () { +pkg_postinst:${SRCNAME}-setup () { if [ -z "$D" ]; then # This is to make sure postgres is configured and running if ! pidof postmaster > /dev/null; then @@ -80,18 +80,18 @@ pkg_postinst_${SRCNAME}-setup () { } PACKAGES += "${SRCNAME}-tests ${SRCNAME}-api ${SRCNAME} ${SRCNAME}-setup" -ALLOW_EMPTY_${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" -FILES_${PN} = "${libdir}/*" +FILES:${PN} = "${libdir}/*" -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \ +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \ " -FILES_${SRCNAME} = "${bindir}/* \ +FILES:${SRCNAME} = "${bindir}/* \ ${sysconfdir}/${SRCNAME}/* \ " -FILES_${SRCNAME}-api = "${bindir}/rally-api \ +FILES:${SRCNAME}-api = "${bindir}/rally-api \ ${sysconfdir}/init.d/rally-api \ " @@ -100,7 +100,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " python-babel \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " python-babel \ python-decorator \ python-fixtures \ python-iso8601 \ @@ -126,7 +131,7 @@ RDEPENDS_${PN} += " python-babel \ python-wsme \ " -RDEPENDS_${SRCNAME}-tests = "${PN} \ +RDEPENDS:${SRCNAME}-tests = "${PN} \ python-coverage \ python-mock \ python-testrepository \ @@ -134,14 +139,14 @@ RDEPENDS_${SRCNAME}-tests = "${PN} \ python-oslotest \ " -RDEPENDS_${SRCNAME} = "${PN} \ +RDEPENDS:${SRCNAME} = "${PN} \ postgresql \ postgresql-client \ " -RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" -RDEPENDS_${SRCNAME}-api = "${SRCNAME}" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" +RDEPENDS:${SRCNAME}-api = "${SRCNAME}" INITSCRIPT_PACKAGES = "${SRCNAME}-api" -INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" -INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api" +INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |