diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-horizon_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-horizon_git.bb | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 5e12e873..4eedeadc 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -9,7 +9,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-pbr \ python-babel \ python-django \ @@ -73,7 +78,7 @@ RDEPENDS_${PN} += " \ SRCNAME = "horizon" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://wsgi-horizon.conf \ file://fix_bindir_path.patch \ file://local_settings.py \ @@ -85,19 +90,19 @@ SRCREV = "246ff9f81248a00a434e66d18fad70519ba811cc" PV = "12.0.0+git${SRCPV}" S = "${WORKDIR}/git" -inherit setuptools systemd python-dir default_configs monitor useradd +inherit setuptools3 systemd python3-dir default_configs monitor useradd USER = "horizon" GROUP = "horizon" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${GROUP}" -USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/openstack-dashboard -s /bin/false -g ${GROUP} ${USER}" +GROUPADD_PARAM:${PN} = "--system ${GROUP}" +USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/openstack-dashboard -s /bin/false -g ${GROUP} ${USER}" # no longer required. kept as reference. # do_install[dirs] += "${D}/usr/share/bin" -do_install_append() { +do_install:append() { SYSCONF_DIR=${D}${sysconfdir} DASHBOARD_CONF_DIR=${SYSCONF_DIR}/openstack-dashboard DASHBOARD_SHARE_DIR=${D}${datadir}/openstack-dashboard @@ -158,7 +163,7 @@ do_install_append() { ln -fs openstack_dashboard/static ${DASHBOARD_SHARE_DIR}/static } -pkg_postinst_${SRCNAME} () { +pkg_postinst:${SRCNAME} () { if [ -n "$D" ]; then exit 1 else @@ -168,39 +173,39 @@ pkg_postinst_${SRCNAME} () { } PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-apache ${SRCNAME}-standalone" -ALLOW_EMPTY_${SRCNAME}-standalone = "1" +ALLOW_EMPTY:${SRCNAME}-standalone = "1" -RDEPENDS_${SRCNAME}-tests += " bash" +RDEPENDS:${SRCNAME}-tests += " bash" -FILES_${PN} = "${libdir}/*" +FILES:${PN} = "${libdir}/*" -FILES_${SRCNAME}-tests = "${sysconfdir}/openstack-dashboard/run_tests.sh" +FILES:${SRCNAME}-tests = "${sysconfdir}/openstack-dashboard/run_tests.sh" -FILES_${SRCNAME} = "${bindir}/* \ +FILES:${SRCNAME} = "${bindir}/* \ ${datadir}/* \ " -FILES_${SRCNAME}-standalone = "${sysconfdir}/init.d/horizon" +FILES:${SRCNAME}-standalone = "${sysconfdir}/init.d/horizon" -FILES_${SRCNAME}-apache = " \ +FILES:${SRCNAME}-apache = " \ ${sysconfdir}/apache2 \ ${sysconfdir}/openstack-dashboard/ \ ${datadir}/openstack-dashboard/ \ " RDEP_ARCH_VAR = "" -RDEP_ARCH_VAR_arm = "nodejs" +RDEP_ARCH_VAR:arm = "nodejs" RDEP_ARCH_VAR_i686 = "nodejs" -RDEP_ARCH_VAR_x86-64 = "nodejs" +RDEP_ARCH_VAR:x86-64 = "nodejs" RDEP_ARCH_VAR_ia32 = "nodejs" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${RDEP_ARCH_VAR} \ " -RDEPENDS_${SRCNAME} = "${PN}" +RDEPENDS:${SRCNAME} = "${PN}" -RDEPENDS_${SRCNAME}-apache = "\ +RDEPENDS:${SRCNAME}-apache = "\ apache2 \ mod-wsgi \ python-lesscpy \ |