diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-swift_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-swift_git.bb | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index fc7c2580..a62d6ab2 100644 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PR = "r0" SRCNAME = "swift" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://proxy-server.conf \ file://dispersion.conf \ file://test.conf \ @@ -20,7 +20,7 @@ SRCREV="4ca08cc395e686265574366497a6869e94eebcb2" PV="2.2.2+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools python-dir update-rc.d hosts identity +inherit setuptools3 python3-dir update-rc.d hosts identity # The size of the backing file (in Gigabytes) of loopback devices # which are used for setting up Swift storage devices. The value @@ -48,7 +48,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { SWIFT_CONF_DIR=${D}${sysconfdir}/swift install -d ${SWIFT_CONF_DIR} @@ -108,7 +108,7 @@ do_install_append() { } -pkg_postinst_${SRCNAME}-setup () { +pkg_postinst:${SRCNAME}-setup () { if [ -z "x$D" ]; then CLUSTER_CONF=/etc/swift/cluster.conf SWIFT_SETUP='/bin/bash /etc/swift/swift_setup.sh' @@ -133,18 +133,18 @@ pkg_postinst_${SRCNAME}-setup () { PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup" -FILES_${PN} = "${libdir}/*\ +FILES:${PN} = "${libdir}/*\ " -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/test.conf \ +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/test.conf \ " -FILES_${SRCNAME}-setup = "${sysconfdir}/init.d/swift \ +FILES:${SRCNAME}-setup = "${sysconfdir}/init.d/swift \ ${sysconfdir}/${SRCNAME}/swift_setup.sh \ ${sysconfdir}/${SRCNAME}/cluster.conf \ " -FILES_${SRCNAME} = "${bindir}/* \ +FILES:${SRCNAME} = "${bindir}/* \ ${sysconfdir}/${SRCNAME}/* \ " @@ -153,7 +153,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-eventlet \ python-greenlet \ python-pastedeploy \ @@ -166,11 +171,11 @@ RDEPENDS_${PN} += " \ bash \ " -RDEPENDS_${SRCNAME} = "${PN}" +RDEPENDS:${SRCNAME} = "${PN}" -RDEPENDS_${SRCNAME} = "${PN}" -RDEPENDS_${SRCNAME}-setup = "${SRCNAME}" +RDEPENDS:${SRCNAME} = "${PN}" +RDEPENDS:${SRCNAME}-setup = "${SRCNAME}" INITSCRIPT_PACKAGES = "${SRCNAME}-setup" -INITSCRIPT_NAME_${SRCNAME}-setup = "swift" -INITSCRIPT_PARAMS_${SRCNAME}-setup = "defaults" +INITSCRIPT_NAME:${SRCNAME}-setup = "swift" +INITSCRIPT_PARAMS:${SRCNAME}-setup = "defaults" |