diff options
595 files changed, 6588 insertions, 7870 deletions
diff --git a/classes/ruby.bbclass b/classes/ruby.bbclass index 15ac9f4b..2814d9c2 100644 --- a/classes/ruby.bbclass +++ b/classes/ruby.bbclass @@ -4,7 +4,7 @@ DEPENDS += " \ ruby-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ " @@ -143,7 +143,7 @@ EXPORT_FUNCTIONS do_compile do_install PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/.debug \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/.debug \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/.debug \ @@ -151,7 +151,7 @@ FILES_${PN}-dbg += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/*/*/*/.debug \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/cache \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin \ @@ -160,6 +160,6 @@ FILES_${PN} += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions \ " -FILES_${PN}-doc += " \ +FILES:${PN}-doc += " \ ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/doc \ " diff --git a/conf/layer.conf b/conf/layer.conf index 4944019b..6d1b82ac 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,5 +7,9 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "cloud-services-layer" BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_cloud-services-layer = "5" -LAYERSERIES_COMPAT_cloud-services-layer = " zeus dunfell" -LAYERDEPENDS_cloud-services-layer = "core filesystems-layer networking-layer" +LAYERSERIES_COMPAT_cloud-services-layer = "scarthgap" +LAYERDEPENDS_cloud-services-layer = "core \ + filesystems-layer \ + networking-layer \ + virtualization-layer \ +" diff --git a/meta-openstack-compute-test-config/recipes-devtools/python/python-neutron_git.bbappend b/meta-openstack-compute-test-config/recipes-devtools/python/python-neutron_git.bbappend index 60e70fca..a77ce164 100644 --- a/meta-openstack-compute-test-config/recipes-devtools/python/python-neutron_git.bbappend +++ b/meta-openstack-compute-test-config/recipes-devtools/python/python-neutron_git.bbappend @@ -1,20 +1,20 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://neutron-test-config.init" NEUTRON_CONF_EXT_ETH_IF ?= "eth0" -do_install_append() { +do_install:append() { sed -e "s:%NEUTRON_CONF_EXT_ETH_IF%:${NEUTRON_CONF_EXT_ETH_IF}:g" -i ${WORKDIR}/neutron-test-config.init sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${WORKDIR}/neutron-test-config.init install -m 0755 ${WORKDIR}/neutron-test-config.init ${D}${sysconfdir}/init.d/neutron-test-config } PACKAGES += " ${SRCNAME}-test-config" -FILES_${SRCNAME}-test-config = "${sysconfdir}/init.d/neutron-test-config" +FILES:${SRCNAME}-test-config = "${sysconfdir}/init.d/neutron-test-config" -RDEPENDS_${SRCNAME}-tests += "${SRCNAME}-test-config" +RDEPENDS:${SRCNAME}-tests += "${SRCNAME}-test-config" INITSCRIPT_PACKAGES += " ${SRCNAME}-test-config" -INITSCRIPT_NAME_${SRCNAME}-test-config = "neutron-test-config" -INITSCRIPT_PARAMS_${SRCNAME}-test-config = "defaults 95 10" +INITSCRIPT_NAME:${SRCNAME}-test-config = "neutron-test-config" +INITSCRIPT_PARAMS:${SRCNAME}-test-config = "defaults 95 10" diff --git a/meta-openstack-controller-test-config/recipes-devtools/python/python-cinder_git.bbappend b/meta-openstack-controller-test-config/recipes-devtools/python/python-cinder_git.bbappend index 50033364..9f03781b 100644 --- a/meta-openstack-controller-test-config/recipes-devtools/python/python-cinder_git.bbappend +++ b/meta-openstack-controller-test-config/recipes-devtools/python/python-cinder_git.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://cinder-test-config.init" -do_install_prepend() { +do_install:prepend() { # Remove nfs cinder-volume backend driver sed -e "s/nfsdriver,//" -i ${WORKDIR}/cinder.conf } -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/cinder-test-config.init ${D}${sysconfdir}/init.d/cinder-test-config } PACKAGES += " ${SRCNAME}-test-config" -FILES_${SRCNAME}-test-config = "${sysconfdir}/init.d/cinder-test-config" +FILES:${SRCNAME}-test-config = "${sysconfdir}/init.d/cinder-test-config" -RDEPENDS_${SRCNAME}-tests += " ${SRCNAME}-test-config" +RDEPENDS:${SRCNAME}-tests += " ${SRCNAME}-test-config" INITSCRIPT_PACKAGES += " ${SRCNAME}-test-config" -INITSCRIPT_NAME_${SRCNAME}-test-config = "cinder-test-config" -INITSCRIPT_PARAMS_${SRCNAME}-test-config = "defaults 95 10" +INITSCRIPT_NAME:${SRCNAME}-test-config = "cinder-test-config" +INITSCRIPT_PARAMS:${SRCNAME}-test-config = "defaults 95 10" diff --git a/meta-openstack-controller-test-config/recipes-devtools/python/python-glance_git.bbappend b/meta-openstack-controller-test-config/recipes-devtools/python/python-glance_git.bbappend index 1c89d517..e9d1d24e 100644 --- a/meta-openstack-controller-test-config/recipes-devtools/python/python-glance_git.bbappend +++ b/meta-openstack-controller-test-config/recipes-devtools/python/python-glance_git.bbappend @@ -1,16 +1,16 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://glance-test-config.init" -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/glance-test-config.init ${D}${sysconfdir}/init.d/glance-test-config } PACKAGES += " ${SRCNAME}-test-config" -FILES_${SRCNAME}-test-config = "${sysconfdir}/init.d/glance-test-config" +FILES:${SRCNAME}-test-config = "${sysconfdir}/init.d/glance-test-config" -RDEPENDS_${SRCNAME}-tests += " ${SRCNAME}-test-config" +RDEPENDS:${SRCNAME}-tests += " ${SRCNAME}-test-config" INITSCRIPT_PACKAGES += " ${SRCNAME}-test-config" -INITSCRIPT_NAME_${SRCNAME}-test-config = "glance-test-config" -INITSCRIPT_PARAMS_${SRCNAME}-test-config = "defaults 95 10" +INITSCRIPT_NAME:${SRCNAME}-test-config = "glance-test-config" +INITSCRIPT_PARAMS:${SRCNAME}-test-config = "defaults 95 10" diff --git a/meta-openstack-controller-test-config/recipes-devtools/python/python-neutron_git.bbappend b/meta-openstack-controller-test-config/recipes-devtools/python/python-neutron_git.bbappend index 2276456f..ca65d94d 100644 --- a/meta-openstack-controller-test-config/recipes-devtools/python/python-neutron_git.bbappend +++ b/meta-openstack-controller-test-config/recipes-devtools/python/python-neutron_git.bbappend @@ -1,20 +1,20 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://neutron-test-config.init" NEUTRON_CONF_EXT_ETH_IF ?= "eth0" -do_install_append() { +do_install:append() { sed -e "s:%NEUTRON_CONF_EXT_ETH_IF%:${NEUTRON_CONF_EXT_ETH_IF}:g" -i ${WORKDIR}/neutron-test-config.init sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${WORKDIR}/neutron-test-config.init install -m 0755 ${WORKDIR}/neutron-test-config.init ${D}${sysconfdir}/init.d/neutron-test-config } PACKAGES += " ${SRCNAME}-test-config" -FILES_${SRCNAME}-test-config = "${sysconfdir}/init.d/neutron-test-config" +FILES:${SRCNAME}-test-config = "${sysconfdir}/init.d/neutron-test-config" -RDEPENDS_${SRCNAME}-tests += " ${SRCNAME}-test-config" +RDEPENDS:${SRCNAME}-tests += " ${SRCNAME}-test-config" INITSCRIPT_PACKAGES += " ${SRCNAME}-test-config" -INITSCRIPT_NAME_${SRCNAME}-test-config = "neutron-test-config" -INITSCRIPT_PARAMS_${SRCNAME}-test-config = "defaults 95 10" +INITSCRIPT_NAME:${SRCNAME}-test-config = "neutron-test-config" +INITSCRIPT_PARAMS:${SRCNAME}-test-config = "defaults 95 10" diff --git a/meta-openstack-controller-test-config/recipes-devtools/python/python-nova_git.bbappend b/meta-openstack-controller-test-config/recipes-devtools/python/python-nova_git.bbappend index c01d6497..997cb763 100644 --- a/meta-openstack-controller-test-config/recipes-devtools/python/python-nova_git.bbappend +++ b/meta-openstack-controller-test-config/recipes-devtools/python/python-nova_git.bbappend @@ -1,16 +1,16 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://nova-test-config.init" -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/nova-test-config.init ${D}${sysconfdir}/init.d/nova-test-config } PACKAGES += " ${SRCNAME}-test-config" -FILES_${SRCNAME}-test-config = "${sysconfdir}/init.d/nova-test-config" +FILES:${SRCNAME}-test-config = "${sysconfdir}/init.d/nova-test-config" -RDEPENDS_${SRCNAME}-tests += " ${SRCNAME}-test-config" +RDEPENDS:${SRCNAME}-tests += " ${SRCNAME}-test-config" INITSCRIPT_PACKAGES += " ${SRCNAME}-test-config" -INITSCRIPT_NAME_${SRCNAME}-test-config = "nova-test-config" -INITSCRIPT_PARAMS_${SRCNAME}-test-config = "defaults 95 10" +INITSCRIPT_NAME:${SRCNAME}-test-config = "nova-test-config" +INITSCRIPT_PARAMS:${SRCNAME}-test-config = "defaults 95 10" diff --git a/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend b/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend index 5d45d629..e4edfde7 100644 --- a/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend +++ b/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if [ ! -f "${WORKDIR}/ceilometer.conf" ]; then return fi diff --git a/meta-openstack-qemu/recipes-devtools/python/python-nova_git.bbappend b/meta-openstack-qemu/recipes-devtools/python/python-nova_git.bbappend index b2e3dff0..42e2fbae 100644 --- a/meta-openstack-qemu/recipes-devtools/python/python-nova_git.bbappend +++ b/meta-openstack-qemu/recipes-devtools/python/python-nova_git.bbappend @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { if [ ! -f "${WORKDIR}/nova.conf" ]; then return fi diff --git a/meta-openstack/Documentation/README.OpenLDAP b/meta-openstack/Documentation/README.OpenLDAP index 06e186ea..95c2227c 100644 --- a/meta-openstack/Documentation/README.OpenLDAP +++ b/meta-openstack/Documentation/README.OpenLDAP @@ -6,7 +6,7 @@ OpenLDAP into DISTRO_FEATURES e.g. in conf/local.conf -DISTRO_FEATURES_append += " OpenLDAP" +DISTRO_FEATURES:append = " OpenLDAP" A number of variables can be specified during the build phase that configures OpenLDAP specific options: diff --git a/meta-openstack/README b/meta-openstack/README index cd1c2e75..127e8142 100644 --- a/meta-openstack/README +++ b/meta-openstack/README @@ -9,7 +9,7 @@ The bbappend files for some recipes (e.g. postgresql) and preferred version sett (e.g. python-networkx)in this layer need to have 'openstack' in DISTRO_FEATURES to have effect. To enable them, add in configuration file the following line. - DISTRO_FEATURES_append = " openstack" + DISTRO_FEATURES:append = " openstack" If meta-openstack is included, but openstack is not enabled as a distro feature a warning is printed at parse time: diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup index b02ebf69..f837f635 100644 --- a/meta-openstack/README.setup +++ b/meta-openstack/README.setup @@ -88,14 +88,14 @@ to the bblayers.conf file: initialized you have to append the necessary variables to ensure that systemd will be used in your images: - DISTRO_FEATURES_append = " systemd" + DISTRO_FEATURES:append = " systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" Additionally activiate the meta-virtualization layer: - DISTRO_FEATURES_append += "virtualization kvm" + DISTRO_FEATURES:append = " virtualization kvm" Package configurations @@ -120,7 +120,7 @@ bblayers.conf file, after the node type deployment layer. If a sample guest image is desired on a control node, the following can be added to local.conf: - IMAGE_INSTALL_append = " cirros-guest-image" + IMAGE_INSTALL:append = " cirros-guest-image" * Cinder Additional Packages * diff --git a/meta-openstack/classes/identity.bbclass b/meta-openstack/classes/identity.bbclass index 1f4f408e..6a08eaeb 100644 --- a/meta-openstack/classes/identity.bbclass +++ b/meta-openstack/classes/identity.bbclass @@ -152,7 +152,7 @@ def servicecreate_param(d, pkg): return service_param # Add the postinst script into the generated package -python populate_packages_append () { +python populate_packages:append () { servicecreate_packages = d.getVar('SERVICECREATE_PACKAGES', True) or "" servicecreate_postinst_common_copy = d.getVar('servicecreate_postinst_common', True) @@ -161,7 +161,7 @@ python populate_packages_append () { for pkg in servicecreate_packages.split(): bb.debug(1, 'Adding service/user creation calls to postinst for %s' % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + postinst = d.getVar('pkg_postinst:%s' % pkg, True) or d.getVar('pkg_postinst', True) if not postinst: postinst = '' @@ -181,6 +181,6 @@ python populate_packages_append () { # Footer. postinst += ' fi\n' - d.setVar('pkg_postinst_%s' % pkg, postinst) - bb.debug(1, 'pkg_postinst_%s = %s' % (pkg, d.getVar('pkg_postinst_%s' % pkg, True))) + d.setVar('pkg_postinst:%s' % pkg, postinst) + bb.debug(1, 'pkg_postinst:%s = %s' % (pkg, d.getVar('pkg_postinst:%s' % pkg, True))) } diff --git a/meta-openstack/classes/rmargparse.bbclass b/meta-openstack/classes/rmargparse.bbclass index 65d84595..e3930cea 100644 --- a/meta-openstack/classes/rmargparse.bbclass +++ b/meta-openstack/classes/rmargparse.bbclass @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { sed -i '/argparse/d' ${D}${libdir}/python2.7/site-packages/*/requires.txt } diff --git a/meta-openstack/conf/distro/include/package_regex_openstack.inc b/meta-openstack/conf/distro/include/package_regex_openstack.inc index 818412b5..2050abce 100644 --- a/meta-openstack/conf/distro/include/package_regex_openstack.inc +++ b/meta-openstack/conf/distro/include/package_regex_openstack.inc @@ -15,350 +15,350 @@ # # The format is as a bitbake variable override for each recipe # -# REGEX_URI_pn-<recipe name> = "recipe_url" +# REGEX_URI:pn-<recipe name> = "recipe_url" # - This is the url used by the package checking system to # get the latest version of the package -# REGEX_pn-<recipe name> = "package_regex" +# REGEX:pn-<recipe name> = "package_regex" # - This is the regex the package checking system uses to -# parse the page found at REGEX_URI_pn-<recipe name> +# parse the page found at REGEX_URI:pn-<recipe name> # COMMON_REGEX = "(?P<pver>(\d+[\.-_]*)+)" # PyPI sites -REGEX_URI_pn-python-cephclient = "https://pypi.python.org/pypi/python-cephclient/" -REGEX_pn-python-cephclient = "/python-cephclient/${COMMON_REGEX}" -REGEX_URI_pn-python-hp3parclient = "https://pypi.python.org/pypi/hp3parclient/" -REGEX_pn-python-hp3parclient = "/hp3parclient/${COMMON_REGEX}" -REGEX_URI_pn-python-openstackclient = "https://pypi.python.org/pypi/python-openstackclient/" -REGEX_pn-python-openstackclient = "/python-openstackclient/${COMMON_REGEX}" +REGEX_URI:pn-python-cephclient = "https://pypi.python.org/pypi/python-cephclient/" +REGEX:pn-python-cephclient = "/python-cephclient/${COMMON_REGEX}" +REGEX_URI:pn-python-hp3parclient = "https://pypi.python.org/pypi/hp3parclient/" +REGEX:pn-python-hp3parclient = "/hp3parclient/${COMMON_REGEX}" +REGEX_URI:pn-python-openstackclient = "https://pypi.python.org/pypi/python-openstackclient/" +REGEX:pn-python-openstackclient = "/python-openstackclient/${COMMON_REGEX}" -REGEX_URI_pn-python-alembic = "https://pypi.python.org/pypi/alembic" -REGEX_pn-python-alembic = "/alembic/(?P<pver>\d+\.\d+\.\d+(\..*)?)" -REGEX_URI_pn-python-amqp = "https://pypi.python.org/pypi/amqp" -REGEX_pn-python-amqp = "/amqp/${COMMON_REGEX}" -REGEX_URI_pn-python-anyjson = "https://pypi.python.org/pypi/anyjson" -REGEX_pn-python-anyjson = "/anyjson/${COMMON_REGEX}" -REGEX_URI_pn-python-babel = "https://pypi.python.org/pypi/Babel" -REGEX_pn-python-babel = "/Babel/${COMMON_REGEX}" -REGEX_URI_pn-python-beautifulsoup4 = "https://pypi.python.org/pypi/beautifulsoup4" -REGEX_pn-python-beautifulsoup4 = "/beautifulsoup4/${COMMON_REGEX}" -REGEX_URI_pn-python-cephclient = "https://pypi.python.org/pypi/python-cephclient" -REGEX_pn-python-cephclient = "/python-cephclient/${COMMON_REGEX}" -REGEX_URI_pn-python-cliff = "https://pypi.python.org/pypi/cliff" -REGEX_pn-python-cliff = "/cliff/${COMMON_REGEX}" -REGEX_URI_pn-python-cmd2 = "https://pypi.python.org/pypi/cmd2" -REGEX_pn-python-cmd2 = "/cmd2/${COMMON_REGEX}" -REGEX_URI_pn-python-colorama = "https://pypi.python.org/pypi/colorama" -REGEX_pn-python-colorama = "/colorama/${COMMON_REGEX}" -REGEX_URI_pn-python-coverage = "https://pypi.python.org/pypi/coverage" -REGEX_pn-python-coverage = "/coverage/(?P<pver>\d+\.\d+(\.)?(a)?(\d)+)" -REGEX_URI_pn-python-croniter = "https://pypi.python.org/pypi/croniter" -REGEX_pn-python-croniter = "/croniter/${COMMON_REGEX}" -REGEX_URI_pn-python-cssselect = "https://pypi.python.org/pypi/cssselect" -REGEX_pn-python-cssselect = "/cssselect/${COMMON_REGEX}" -REGEX_URI_pn-python-decorator = "https://pypi.python.org/pypi/decorator" -REGEX_pn-python-decorator = "/decorator/${COMMON_REGEX}" -REGEX_URI_pn-python-django = "https://pypi.python.org/pypi/Django" -REGEX_pn-python-django = "/Django/${COMMON_REGEX}" -REGEX_URI_pn-python-django-appconf = "https://pypi.python.org/pypi/django-appconf" -REGEX_pn-python-django-appconf = "/django-appconf/${COMMON_REGEX}" -REGEX_URI_pn-python-django-compressor = "https://pypi.python.org/pypi/django_compressor" -REGEX_pn-python-django-compressor = "/django_compressor/${COMMON_REGEX}" -REGEX_URI_pn-python-django-nose = "https://pypi.python.org/pypi/django-nose" -REGEX_pn-python-django-nose = "/django-nose/${COMMON_REGEX}" -REGEX_URI_pn-python-django-openstack-auth = "https://pypi.python.org/pypi/django_openstack_auth" -REGEX_pn-python-django-openstack-auth = "/django_openstack_auth/${COMMON_REGEX}" -REGEX_URI_pn-python-django-pyscss = "https://pypi.python.org/pypi/django-pyscss" -REGEX_pn-python-django-pyscss = "/django-pyscss/${COMMON_REGEX}" -REGEX_URI_pn-python-dogpile.cache = "https://pypi.python.org/pypi/dogpile.cache" -REGEX_pn-python-dogpile.cache = "/dogpile.cache/${COMMON_REGEX}" -REGEX_URI_pn-python-dogpile.core = "https://pypi.python.org/pypi/dogpile.core" -REGEX_pn-python-dogpile.core = "/dogpile.core/${COMMON_REGEX}" -REGEX_URI_pn-python-eventlet = "https://pypi.python.org/pypi/eventlet" -REGEX_pn-python-eventlet = "/eventlet/${COMMON_REGEX}" -REGEX_URI_pn-python-extras = "https://pypi.python.org/pypi/extras" -REGEX_pn-python-extras = "/extras/${COMMON_REGEX}" -REGEX_URI_pn-python-falcon = "https://pypi.python.org/pypi/falcon" -REGEX_pn-python-falcon = "/falcon/${COMMON_REGEX}" -REGEX_URI_pn-python-fixtures = "https://pypi.python.org/pypi/fixtures" -REGEX_pn-python-fixtures = "/fixtures/${COMMON_REGEX}" -REGEX_URI_pn-python-flake8 = "https://pypi.python.org/pypi/flake8" -REGEX_pn-python-flake8 = "/flake8/${COMMON_REGEX}" -REGEX_URI_pn-python-futures = "https://pypi.python.org/pypi/futures" -REGEX_pn-python-futures = "/futures/${COMMON_REGEX}" -REGEX_URI_pn-python-greenlet = "https://pypi.python.org/pypi/" -REGEX_pn-python-greenlet = "//${COMMON_REGEX}" -REGEX_URI_pn-python-happybase = "https://pypi.python.org/pypi/happybase" -REGEX_pn-python-happybase = "/happybase/${COMMON_REGEX}" -REGEX_URI_pn-python-heat-cfntools = "https://pypi.python.org/pypi/heat-cfntools" -REGEX_pn-python-heat-cfntools = "/heat-cfntools/${COMMON_REGEX}" -REGEX_URI_pn-python-hgtools = "https://pypi.python.org/pypi/hgtools" -REGEX_pn-python-hgtools = "/hgtools/${COMMON_REGEX}" -REGEX_URI_pn-python-hp3parclient = "https://pypi.python.org/pypi/hp3parclient" -REGEX_pn-python-hp3parclient = "/hp3parclient/${COMMON_REGEX}" -REGEX_URI_pn-python-html5lib = "https://pypi.python.org/pypi/html5lib" -REGEX_pn-python-html5lib = "/html5lib/${COMMON_REGEX}" -REGEX_URI_pn-python-httplib2 = "https://pypi.python.org/pypi/httplib2" -REGEX_pn-python-httplib2 = "/httplib2/${COMMON_REGEX}" -REGEX_URI_pn-python-httpretty = "https://pypi.python.org/pypi/httpretty" -REGEX_pn-python-httpretty = "/httpretty/${COMMON_REGEX}" -REGEX_URI_pn-python-i18n = "https://pypi.python.org/pypi/python-i18n" -REGEX_pn-python-i18n = "/python-i18n/${COMMON_REGEX}" -REGEX_URI_pn-python-ipaddr = "https://pypi.python.org/pypi/ipaddr" -REGEX_pn-python-ipaddr = "/ipaddr/${COMMON_REGEX}" -REGEX_URI_pn-python-iso8601 = "https://pypi.python.org/pypi/iso8601" -REGEX_pn-python-iso8601 = "/iso8601/${COMMON_REGEX}" -REGEX_URI_pn-python-jinja2 = "https://pypi.python.org/pypi/Jinja2" -REGEX_pn-python-jinja2 = "/Jinja2/${COMMON_REGEX}" -REGEX_URI_pn-python-jsonpatch = "https://pypi.python.org/pypi/jsonpatch" -REGEX_pn-python-jsonpatch = "/jsonpatch/${COMMON_REGEX}" -REGEX_URI_pn-python-jsonpath-rw = "https://pypi.python.org/pypi/jsonpath-rw" -REGEX_pn-python-jsonpath-rw = "/jsonpath-rw/${COMMON_REGEX}" -REGEX_URI_pn-python-jsonpointer = "https://pypi.python.org/pypi/jsonpointer" -REGEX_pn-python-jsonpointer = "/jsonpointer/${COMMON_REGEX}" -REGEX_URI_pn-python-jsonschema = "https://pypi.python.org/pypi/jsonschema" -REGEX_pn-python-jsonschema = "/jsonschema/${COMMON_REGEX}" -REGEX_URI_pn-python-kazoo = "https://pypi.python.org/pypi/kazoo" -REGEX_pn-python-kazoo = "/kazoo/${COMMON_REGEX}" -REGEX_URI_pn-python-keyring = "https://pypi.python.org/pypi/keyring" -REGEX_pn-python-keyring = "/keyring/${COMMON_REGEX}" -REGEX_URI_pn-python-kombu = "https://pypi.python.org/pypi/kombu" -REGEX_pn-python-kombu = "/kombu/${COMMON_REGEX}" -REGEX_URI_pn-python-lesscpy = "https://pypi.python.org/pypi/lesscpy" -REGEX_pn-python-lesscpy = "/lesscpy/${COMMON_REGEX}" -REGEX_URI_pn-python-lockfile = "https://pypi.python.org/pypi/lockfile" -REGEX_pn-python-lockfile = "/lockfile/${COMMON_REGEX}" -REGEX_URI_pn-python-logutils = "https://pypi.python.org/pypi/logutils" -REGEX_pn-python-logutils = "/logutils/${COMMON_REGEX}" -REGEX_URI_pn-python-lxml = "https://pypi.python.org/pypi/lxml" -REGEX_pn-python-lxml = "/lxml/${COMMON_REGEX}" -REGEX_URI_pn-python-mako = "https://pypi.python.org/pypi/Mako" -REGEX_pn-python-mako = "/Mako/${COMMON_REGEX}" -REGEX_URI_pn-python-markupsafe = "https://pypi.python.org/pypi/MarkupSafe" -REGEX_pn-python-markupsafe = "/MarkupSafe/${COMMON_REGEX}" -REGEX_URI_pn-python-mccabe = "https://pypi.python.org/pypi/mccabe" -REGEX_pn-python-mccabe = "/mccabe/${COMMON_REGEX}" -REGEX_URI_pn-python-memcache = "https://pypi.python.org/pypi/pymemcache" -REGEX_pn-python-memcache = "/pymemcache/${COMMON_REGEX}" -REGEX_URI_pn-python-memcached = "https://pypi.python.org/pypi/" -REGEX_pn-python-memcached = "//${COMMON_REGEX}" -REGEX_URI_pn-python-mimeparse = "https://pypi.python.org/pypi/python-mimeparse" -REGEX_pn-python-mimeparse = "/python-mimeparse/${COMMON_REGEX}" -REGEX_URI_pn-python-mock = "https://pypi.python.org/pypi/mock" -REGEX_pn-python-mock = "/mock/${COMMON_REGEX}" -REGEX_URI_pn-python-mox = "https://pypi.python.org/pypi/mox" -REGEX_pn-python-mox = "/mox/${COMMON_REGEX}" -REGEX_URI_pn-python-mox3 = "https://pypi.python.org/pypi/mox3" -REGEX_pn-python-mox3 = "/mox3/${COMMON_REGEX}" -REGEX_URI_pn-python-msgpack = "https://pypi.python.org/pypi/msgpack-python" -REGEX_pn-python-msgpack = "/msgpack-python/${COMMON_REGEX}" -REGEX_URI_pn-python-netaddr = "https://pypi.python.org/pypi/netaddr" -REGEX_pn-python-netaddr = "/netaddr/${COMMON_REGEX}" -REGEX_URI_pn-python-netifaces = "https://pypi.python.org/pypi/netifaces" -REGEX_pn-python-netifaces = "/netifaces/${COMMON_REGEX}" -REGEX_URI_pn-python-networkx = "https://pypi.python.org/pypi/networkx" -REGEX_pn-python-networkx = "/networkx/${COMMON_REGEX}" -REGEX_URI_pn-python-nose-exclude = "https://pypi.python.org/pypi/nose-exclude" -REGEX_pn-python-nose-exclude = "/nose-exclude/${COMMON_REGEX}" -REGEX_URI_pn-python-oauth2 = "https://pypi.python.org/pypi/oauth2" -REGEX_pn-python-oauth2 = "/oauth2/${COMMON_REGEX}" -REGEX_URI_pn-python-oauthlib = "https://pypi.python.org/pypi/oauthlib" -REGEX_pn-python-oauthlib = "/oauthlib/${COMMON_REGEX}" -REGEX_URI_pn-python-openstackclient = "https://pypi.python.org/pypi/python-openstackclient" -REGEX_pn-python-openstackclient = "/python-openstackclient/${COMMON_REGEX}" -REGEX_URI_pn-python-openstack-nose = "https://pypi.python.org/pypi/openstack.nose_plugin" -REGEX_pn-python-openstack-nose = "/openstack.nose_plugin/${COMMON_REGEX}" -REGEX_URI_pn-python-oslo.concurrency = "https://pypi.python.org/pypi/oslo.concurrency" -REGEX_pn-python-oslo.concurrency = "/oslo.concurrency/${COMMON_REGEX}" -REGEX_URI_pn-python-oslo.config = "https://pypi.python.org/pypi/oslo.config" -REGEX_pn-python-oslo.config = "/oslo.config/${COMMON_REGEX}" -REGEX_URI_pn-python-oslo.db = "https://pypi.python.org/pypi/oslo.db" -REGEX_pn-python-oslo.db = "/oslo.db/${COMMON_REGEX}" -REGEX_URI_pn-python-oslo.i18n = "https://pypi.python.org/pypi/oslo.i18n" -REGEX_pn-python-oslo.i18n = "/oslo.i18n/${COMMON_REGEX}" -REGEX_URI_pn-python-oslo.middleware = "https://pypi.python.org/pypi/oslo.middleware" -REGEX_pn-python-oslo.middleware = "/oslo.middleware/${COMMON_REGEX}" -REGEX_URI_pn-python-oslo.rootwrap = "https://pypi.python.org/pypi/oslo.rootwrap" -REGEX_pn-python-oslo.rootwrap = "/oslo.rootwrap/${COMMON_REGEX}" -REGEX_URI_pn-python-oslotest = "https://pypi.python.org/pypi/oslotest" -REGEX_pn-python-oslotest = "/oslotest/${COMMON_REGEX}" -REGEX_URI_pn-python-osprofiler = "https://pypi.python.org/pypi/osprofiler" -REGEX_pn-python-osprofiler = "/osprofiler/${COMMON_REGEX}" -REGEX_URI_pn-python-pam = "https://pypi.python.org/pypi/pam" -REGEX_pn-python-pam = "/pam/${COMMON_REGEX}" -REGEX_URI_pn-python-paramiko = "https://pypi.python.org/pypi/paramiko" -REGEX_pn-python-paramiko = "/paramiko/${COMMON_REGEX}" -REGEX_URI_pn-python-passlib = "https://pypi.python.org/pypi/passlib" -REGEX_pn-python-passlib = "/passlib/${COMMON_REGEX}" -REGEX_URI_pn-python-paste = "https://pypi.python.org/pypi/Paste" -REGEX_pn-python-paste = "/Paste/${COMMON_REGEX}" -REGEX_URI_pn-python-pastedeploy = "https://pypi.python.org/pypi/PasteDeploy" -REGEX_pn-python-pastedeploy = "/PasteDeploy/${COMMON_REGEX}" -REGEX_URI_pn-python-pbr = "https://pypi.python.org/pypi/pbr" -REGEX_pn-python-pbr = "/pbr/${COMMON_REGEX}" -REGEX_URI_pn-python-pecan = "https://pypi.python.org/pypi/pecan" -REGEX_pn-python-pecan = "/pecan/${COMMON_REGEX}" -REGEX_URI_pn-python-pep8 = "https://pypi.python.org/pypi/pep8" -REGEX_pn-python-pep8 = "/pep8/${COMMON_REGEX}" -REGEX_URI_pn-python-pexpect = "https://pypi.python.org/pypi/pexpect" -REGEX_pn-python-pexpect = "/pexpect/${COMMON_REGEX}" -REGEX_URI_pn-python-pint = "https://pypi.python.org/pypi/Pint" -REGEX_pn-python-pint = "/Pint/${COMMON_REGEX}" -REGEX_URI_pn-python-ply = "https://pypi.python.org/pypi/ply" -REGEX_pn-python-ply = "/ply/${COMMON_REGEX}" -REGEX_URI_pn-python-posix-ipc = "https://pypi.python.org/pypi/posix_ipc" -REGEX_pn-python-posix-ipc = "/posix_ipc/${COMMON_REGEX}" -REGEX_URI_pn-python-prettytable = "https://pypi.python.org/pypi/prettytable" -REGEX_pn-python-prettytable = "/prettytable/${COMMON_REGEX}" -REGEX_URI_pn-python-psycopg2 = "https://pypi.python.org/pypi/psycopg2" -REGEX_pn-python-psycopg2 = "/psycopg2/${COMMON_REGEX}" -REGEX_URI_pn-python-py = "https://pypi.python.org/pypi/py" -REGEX_pn-python-py = "/py/${COMMON_REGEX}" -REGEX_URI_pn-python-pyasn1 = "https://pypi.python.org/pypi/pyasn1" -REGEX_pn-python-pyasn1 = "/pyasn1/${COMMON_REGEX}" -REGEX_URI_pn-python-pycadf = "https://pypi.python.org/pypi/pycadf" -REGEX_pn-python-pycadf = "/pycadf/${COMMON_REGEX}" -REGEX_URI_pn-python-pycrypto = "https://pypi.python.org/pypi/pycrypto" -REGEX_pn-python-pycrypto = "/pycrypto/${COMMON_REGEX}" -REGEX_URI_pn-python-pyflakes = "https://pypi.python.org/pypi/pyflakes" -REGEX_pn-python-pyflakes = "/pyflakes/${COMMON_REGEX}" -REGEX_URI_pn-python-pymongo = "https://pypi.python.org/pypi/pymongo" -REGEX_pn-python-pymongo = "/pymongo/${COMMON_REGEX}" -REGEX_URI_pn-python-pyparsing = "https://pypi.python.org/pypi/pyparsing" -REGEX_pn-python-pyparsing = "/pyparsing/${COMMON_REGEX}" -REGEX_URI_pn-python-pysaml2 = "https://pypi.python.org/pypi/pysaml2" -REGEX_pn-python-pysaml2 = "/pysaml2/${COMMON_REGEX}" -REGEX_URI_pn-python-pyscss = "https://pypi.python.org/pypi/pyScss" -REGEX_pn-python-pyscss = "/pyScss/${COMMON_REGEX}" -REGEX_URI_pn-python-pysnmp = "https://pypi.python.org/pypi/pysnmp" -REGEX_pn-python-pysnmp = "/pysnmp/${COMMON_REGEX}" -REGEX_URI_pn-python-pysqlite = "https://pypi.python.org/pypi/pysqlite" -REGEX_pn-python-pysqlite = "/pysqlite/${COMMON_REGEX}" -REGEX_URI_pn-python-pytest = "https://pypi.python.org/pypi/pytest" -REGEX_pn-python-pytest = "/pytest/${COMMON_REGEX}" -REGEX_URI_pn-python-pytz = "https://pypi.python.org/pypi/pytz" -REGEX_pn-python-pytz = "/pytz/${COMMON_REGEX}" -REGEX_URI_pn-python-pyudev = "https://pypi.python.org/pypi/pyudev" -REGEX_pn-python-pyudev = "/pyudev/${COMMON_REGEX}" -REGEX_URI_pn-python-retrying = "https://pypi.python.org/pypi/retrying" -REGEX_pn-python-retrying = "/retrying/${COMMON_REGEX}" -REGEX_URI_pn-python-rfc3986 = "https://pypi.python.org/pypi/rfc3986" -REGEX_pn-python-rfc3986 = "/rfc3986/${COMMON_REGEX}" -REGEX_URI_pn-python-routes = "https://pypi.python.org/pypi/Routes" -REGEX_pn-python-routes = "/Routes/${COMMON_REGEX}" -REGEX_URI_pn-python-rtslib-fb = "https://pypi.python.org/pypi/rtslib-fb" -REGEX_pn-python-rtslib-fb = "/rtslib-fb/${COMMON_REGEX}" -REGEX_URI_pn-python-setuptools-git = "https://pypi.python.org/pypi/setuptools-git" -REGEX_pn-python-setuptools-git = "/setuptools-git/${COMMON_REGEX}" -REGEX_URI_pn-python-simplegeneric = "https://pypi.python.org/pypi/simplegeneric" -REGEX_pn-python-simplegeneric = "/simplegeneric/${COMMON_REGEX}" -REGEX_URI_pn-python-singledispatch = "https://pypi.python.org/pypi/singledispatch" -REGEX_pn-python-singledispatch = "/singledispatch/${COMMON_REGEX}" -REGEX_URI_pn-python-sqlalchemy-migrate = "https://pypi.python.org/pypi/sqlalchemy-migrate" -REGEX_pn-python-sqlalchemy-migrate = "/sqlalchemy-migrate/${COMMON_REGEX}" -REGEX_URI_pn-python-stevedore = "https://pypi.python.org/pypi/stevedore" -REGEX_pn-python-stevedore = "/stevedore/${COMMON_REGEX}" -REGEX_URI_pn-python-subunit = "https://pypi.python.org/pypi/python-subunit" -REGEX_pn-python-subunit = "/python-subunit/${COMMON_REGEX}" -REGEX_URI_pn-python-sysv-ipc = "https://pypi.python.org/pypi/sysv_ipc" -REGEX_pn-python-sysv-ipc = "/sysv_ipc/${COMMON_REGEX}" -REGEX_URI_pn-python-tempita = "https://pypi.python.org/pypi/Tempita" -REGEX_pn-python-tempita = "/Tempita/(?P<pver>\d+\.\d+\.\d((\w)*)?)" -REGEX_URI_pn-python-termcolor = "https://pypi.python.org/pypi/termcolor" -REGEX_pn-python-termcolor = "/termcolor/${COMMON_REGEX}" -REGEX_URI_pn-python-testrepository = "https://pypi.python.org/pypi/testrepository" -REGEX_pn-python-testrepository = "/testrepository/${COMMON_REGEX}" -REGEX_URI_pn-python-testresources = "https://pypi.python.org/pypi/testresources" -REGEX_pn-python-testresources = "/testresources/${COMMON_REGEX}" -REGEX_URI_pn-python-testscenarios = "https://pypi.python.org/pypi/testscenarios" -REGEX_pn-python-testscenarios = "/testscenarios/${COMMON_REGEX}" -REGEX_URI_pn-python-testtools = "https://pypi.python.org/pypi/testtools" -REGEX_pn-python-testtools = "/testtools/${COMMON_REGEX}" -REGEX_URI_pn-python-thrift = "https://pypi.python.org/pypi/thrift" -REGEX_pn-python-thrift = "/thrift/${COMMON_REGEX}" -REGEX_URI_pn-python-tooz = "https://pypi.python.org/pypi/tooz" -REGEX_pn-python-tooz = "/tooz/${COMMON_REGEX}" -REGEX_URI_pn-python-tox = "https://pypi.python.org/pypi/tox" -REGEX_pn-python-tox = "/tox/${COMMON_REGEX}" -REGEX_URI_pn-python-virtualenv = "https://pypi.python.org/pypi/virtualenv" -REGEX_pn-python-virtualenv = "/virtualenv/${COMMON_REGEX}" -REGEX_URI_pn-python-waitress = "https://pypi.python.org/pypi/waitress" -REGEX_pn-python-waitress = "/waitress/${COMMON_REGEX}" -REGEX_URI_pn-python-warlock = "https://pypi.python.org/pypi/warlock" -REGEX_pn-python-warlock = "/warlock/${COMMON_REGEX}" -REGEX_URI_pn-python-websockify = "https://pypi.python.org/pypi/websockify" -REGEX_pn-python-websockify = "/websockify/${COMMON_REGEX}" -REGEX_URI_pn-python-webtest = "https://pypi.python.org/pypi/WebTest" -REGEX_pn-python-webtest = "/WebTest/${COMMON_REGEX}" -REGEX_URI_pn-python-wsgiref = "https://pypi.python.org/pypi/wsgiref" -REGEX_pn-python-wsgiref = "/wsgiref/${COMMON_REGEX}" -REGEX_URI_pn-python-wsme = "https://pypi.python.org/pypi/WSME" -REGEX_pn-python-wsme = "/WSME/${COMMON_REGEX}" -REGEX_URI_pn-python-xattr = "https://pypi.python.org/pypi/xattr" -REGEX_pn-python-xattr = "/xattr/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic = "https://pypi.python.org/pypi/XStatic" -REGEX_pn-python-xstatic = "/XStatic/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-angular = "https://pypi.python.org/pypi/XStatic-Angular" -REGEX_pn-python-xstatic-angular = "/XStatic-Angular/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-angular-bootstrap = "https://pypi.python.org/pypi/XStatic-Angular-Bootstrap" -REGEX_pn-python-xstatic-angular-bootstrap = "/XStatic-Angular-Bootstrap/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-angular-cookies = "https://pypi.python.org/pypi/XStatic-Angular-Cookies" -REGEX_pn-python-xstatic-angular-cookies = "/XStatic-Angular-Cookies/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-angular-mock = "https://pypi.python.org/pypi/XStatic-Angular-Mock" -REGEX_pn-python-xstatic-angular-mock = "/XStatic-Angular-Mock/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-bootstrap-datepicker = "https://pypi.python.org/pypi/XStatic-Bootstrap-Datepicker" -REGEX_pn-python-xstatic-bootstrap-datepicker = "/XStatic-Bootstrap-Datepicker/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-bootstrap-scss = "https://pypi.python.org/pypi/XStatic-Bootstrap-SCSS" -REGEX_pn-python-xstatic-bootstrap-scss = "/XStatic-Bootstrap-SCSS/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-d3 = "https://pypi.python.org/pypi/XStatic-D3" -REGEX_pn-python-xstatic-d3 = "/XStatic-D3/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-font-awesome = "https://pypi.python.org/pypi/XStatic-Font-Awesome" -REGEX_pn-python-xstatic-font-awesome = "/XStatic-Font-Awesome/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-hogan = "https://pypi.python.org/pypi/XStatic-Hogan" -REGEX_pn-python-xstatic-hogan = "/XStatic-Hogan/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jasmine = "https://pypi.python.org/pypi/XStatic-Jasmine" -REGEX_pn-python-xstatic-jasmine = "/XStatic-Jasmine/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jquery = "https://pypi.python.org/pypi/XStatic-jQuery" -REGEX_pn-python-xstatic-jquery = "/XStatic-jQuery/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jquery-migrate = "https://pypi.python.org/pypi/XStatic-JQuery-Migrate" -REGEX_pn-python-xstatic-jquery-migrate = "/XStatic-JQuery-Migrate/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jquery-quicksearch = "https://pypi.python.org/pypi/XStatic-JQuery.quicksearch" -REGEX_pn-python-xstatic-jquery-quicksearch = "/XStatic-JQuery.quicksearch/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jquery-tablesorter = "https://pypi.python.org/pypi/XStatic-JQuery.TableSorter" -REGEX_pn-python-xstatic-jquery-tablesorter = "/XStatic-JQuery.TableSorter/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jquery-ui = "https://pypi.python.org/pypi/XStatic-jquery-ui" -REGEX_pn-python-xstatic-jquery-ui = "/XStatic-jquery-ui/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-jsencrypt = "https://pypi.python.org/pypi/XStatic-JSEncrypt" -REGEX_pn-python-xstatic-jsencrypt = "/XStatic-JSEncrypt/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-qunit = "https://pypi.python.org/pypi/XStatic-QUnit" -REGEX_pn-python-xstatic-qunit = "/XStatic-QUnit/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-rickshaw = "https://pypi.python.org/pypi/XStatic-Rickshaw" -REGEX_pn-python-xstatic-rickshaw = "/XStatic-Rickshaw/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-smart-table = "https://pypi.python.org/pypi/XStatic-smart-table" -REGEX_pn-python-xstatic-smart-table = "/XStatic-smart-table/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-spin = "https://pypi.python.org/pypi/XStatic-Spin" -REGEX_pn-python-xstatic-spin = "/XStatic-Spin/${COMMON_REGEX}" -REGEX_URI_pn-python-xstatic-term.js = "https://pypi.python.org/pypi/XStatic-term.js" -REGEX_pn-python-xstatic-term.js = "/XStatic-term.js/${COMMON_REGEX}" -REGEX_URI_pn-python-zake = "https://pypi.python.org/pypi/zake" -REGEX_pn-python-zake = "/zake/${COMMON_REGEX}" +REGEX_URI:pn-python-alembic = "https://pypi.python.org/pypi/alembic" +REGEX:pn-python-alembic = "/alembic/(?P<pver>\d+\.\d+\.\d+(\..*)?)" +REGEX_URI:pn-python-amqp = "https://pypi.python.org/pypi/amqp" +REGEX:pn-python-amqp = "/amqp/${COMMON_REGEX}" +REGEX_URI:pn-python-anyjson = "https://pypi.python.org/pypi/anyjson" +REGEX:pn-python-anyjson = "/anyjson/${COMMON_REGEX}" +REGEX_URI:pn-python-babel = "https://pypi.python.org/pypi/Babel" +REGEX:pn-python-babel = "/Babel/${COMMON_REGEX}" +REGEX_URI:pn-python-beautifulsoup4 = "https://pypi.python.org/pypi/beautifulsoup4" +REGEX:pn-python-beautifulsoup4 = "/beautifulsoup4/${COMMON_REGEX}" +REGEX_URI:pn-python-cephclient = "https://pypi.python.org/pypi/python-cephclient" +REGEX:pn-python-cephclient = "/python-cephclient/${COMMON_REGEX}" +REGEX_URI:pn-python-cliff = "https://pypi.python.org/pypi/cliff" +REGEX:pn-python-cliff = "/cliff/${COMMON_REGEX}" +REGEX_URI:pn-python-cmd2 = "https://pypi.python.org/pypi/cmd2" +REGEX:pn-python-cmd2 = "/cmd2/${COMMON_REGEX}" +REGEX_URI:pn-python-colorama = "https://pypi.python.org/pypi/colorama" +REGEX:pn-python-colorama = "/colorama/${COMMON_REGEX}" +REGEX_URI:pn-python-coverage = "https://pypi.python.org/pypi/coverage" +REGEX:pn-python-coverage = "/coverage/(?P<pver>\d+\.\d+(\.)?(a)?(\d)+)" +REGEX_URI:pn-python-croniter = "https://pypi.python.org/pypi/croniter" +REGEX:pn-python-croniter = "/croniter/${COMMON_REGEX}" +REGEX_URI:pn-python-cssselect = "https://pypi.python.org/pypi/cssselect" +REGEX:pn-python-cssselect = "/cssselect/${COMMON_REGEX}" +REGEX_URI:pn-python-decorator = "https://pypi.python.org/pypi/decorator" +REGEX:pn-python-decorator = "/decorator/${COMMON_REGEX}" +REGEX_URI:pn-python-django = "https://pypi.python.org/pypi/Django" +REGEX:pn-python-django = "/Django/${COMMON_REGEX}" +REGEX_URI:pn-python-django-appconf = "https://pypi.python.org/pypi/django-appconf" +REGEX:pn-python-django-appconf = "/django-appconf/${COMMON_REGEX}" +REGEX_URI:pn-python-django-compressor = "https://pypi.python.org/pypi/django_compressor" +REGEX:pn-python-django-compressor = "/django_compressor/${COMMON_REGEX}" +REGEX_URI:pn-python-django-nose = "https://pypi.python.org/pypi/django-nose" +REGEX:pn-python-django-nose = "/django-nose/${COMMON_REGEX}" +REGEX_URI:pn-python-django-openstack-auth = "https://pypi.python.org/pypi/django_openstack_auth" +REGEX:pn-python-django-openstack-auth = "/django_openstack_auth/${COMMON_REGEX}" +REGEX_URI:pn-python-django-pyscss = "https://pypi.python.org/pypi/django-pyscss" +REGEX:pn-python-django-pyscss = "/django-pyscss/${COMMON_REGEX}" +REGEX_URI:pn-python-dogpile.cache = "https://pypi.python.org/pypi/dogpile.cache" +REGEX:pn-python-dogpile.cache = "/dogpile.cache/${COMMON_REGEX}" +REGEX_URI:pn-python-dogpile.core = "https://pypi.python.org/pypi/dogpile.core" +REGEX:pn-python-dogpile.core = "/dogpile.core/${COMMON_REGEX}" +REGEX_URI:pn-python-eventlet = "https://pypi.python.org/pypi/eventlet" +REGEX:pn-python-eventlet = "/eventlet/${COMMON_REGEX}" +REGEX_URI:pn-python-extras = "https://pypi.python.org/pypi/extras" +REGEX:pn-python-extras = "/extras/${COMMON_REGEX}" +REGEX_URI:pn-python-falcon = "https://pypi.python.org/pypi/falcon" +REGEX:pn-python-falcon = "/falcon/${COMMON_REGEX}" +REGEX_URI:pn-python-fixtures = "https://pypi.python.org/pypi/fixtures" +REGEX:pn-python-fixtures = "/fixtures/${COMMON_REGEX}" +REGEX_URI:pn-python-flake8 = "https://pypi.python.org/pypi/flake8" +REGEX:pn-python-flake8 = "/flake8/${COMMON_REGEX}" +REGEX_URI:pn-python-futures = "https://pypi.python.org/pypi/futures" +REGEX:pn-python-futures = "/futures/${COMMON_REGEX}" +REGEX_URI:pn-python-greenlet = "https://pypi.python.org/pypi/" +REGEX:pn-python-greenlet = "//${COMMON_REGEX}" +REGEX_URI:pn-python-happybase = "https://pypi.python.org/pypi/happybase" +REGEX:pn-python-happybase = "/happybase/${COMMON_REGEX}" +REGEX_URI:pn-python-heat-cfntools = "https://pypi.python.org/pypi/heat-cfntools" +REGEX:pn-python-heat-cfntools = "/heat-cfntools/${COMMON_REGEX}" +REGEX_URI:pn-python-hgtools = "https://pypi.python.org/pypi/hgtools" +REGEX:pn-python-hgtools = "/hgtools/${COMMON_REGEX}" +REGEX_URI:pn-python-hp3parclient = "https://pypi.python.org/pypi/hp3parclient" +REGEX:pn-python-hp3parclient = "/hp3parclient/${COMMON_REGEX}" +REGEX_URI:pn-python-html5lib = "https://pypi.python.org/pypi/html5lib" +REGEX:pn-python-html5lib = "/html5lib/${COMMON_REGEX}" +REGEX_URI:pn-python-httplib2 = "https://pypi.python.org/pypi/httplib2" +REGEX:pn-python-httplib2 = "/httplib2/${COMMON_REGEX}" +REGEX_URI:pn-python-httpretty = "https://pypi.python.org/pypi/httpretty" +REGEX:pn-python-httpretty = "/httpretty/${COMMON_REGEX}" +REGEX_URI:pn-python-i18n = "https://pypi.python.org/pypi/python-i18n" +REGEX:pn-python-i18n = "/python-i18n/${COMMON_REGEX}" +REGEX_URI:pn-python-ipaddr = "https://pypi.python.org/pypi/ipaddr" +REGEX:pn-python-ipaddr = "/ipaddr/${COMMON_REGEX}" +REGEX_URI:pn-python-iso8601 = "https://pypi.python.org/pypi/iso8601" +REGEX:pn-python-iso8601 = "/iso8601/${COMMON_REGEX}" +REGEX_URI:pn-python-jinja2 = "https://pypi.python.org/pypi/Jinja2" +REGEX:pn-python-jinja2 = "/Jinja2/${COMMON_REGEX}" +REGEX_URI:pn-python-jsonpatch = "https://pypi.python.org/pypi/jsonpatch" +REGEX:pn-python-jsonpatch = "/jsonpatch/${COMMON_REGEX}" +REGEX_URI:pn-python-jsonpath-rw = "https://pypi.python.org/pypi/jsonpath-rw" +REGEX:pn-python-jsonpath-rw = "/jsonpath-rw/${COMMON_REGEX}" +REGEX_URI:pn-python-jsonpointer = "https://pypi.python.org/pypi/jsonpointer" +REGEX:pn-python-jsonpointer = "/jsonpointer/${COMMON_REGEX}" +REGEX_URI:pn-python-jsonschema = "https://pypi.python.org/pypi/jsonschema" +REGEX:pn-python-jsonschema = "/jsonschema/${COMMON_REGEX}" +REGEX_URI:pn-python-kazoo = "https://pypi.python.org/pypi/kazoo" +REGEX:pn-python-kazoo = "/kazoo/${COMMON_REGEX}" +REGEX_URI:pn-python-keyring = "https://pypi.python.org/pypi/keyring" +REGEX:pn-python-keyring = "/keyring/${COMMON_REGEX}" +REGEX_URI:pn-python-kombu = "https://pypi.python.org/pypi/kombu" +REGEX:pn-python-kombu = "/kombu/${COMMON_REGEX}" +REGEX_URI:pn-python-lesscpy = "https://pypi.python.org/pypi/lesscpy" +REGEX:pn-python-lesscpy = "/lesscpy/${COMMON_REGEX}" +REGEX_URI:pn-python-lockfile = "https://pypi.python.org/pypi/lockfile" +REGEX:pn-python-lockfile = "/lockfile/${COMMON_REGEX}" +REGEX_URI:pn-python-logutils = "https://pypi.python.org/pypi/logutils" +REGEX:pn-python-logutils = "/logutils/${COMMON_REGEX}" +REGEX_URI:pn-python-lxml = "https://pypi.python.org/pypi/lxml" +REGEX:pn-python-lxml = "/lxml/${COMMON_REGEX}" +REGEX_URI:pn-python-mako = "https://pypi.python.org/pypi/Mako" +REGEX:pn-python-mako = "/Mako/${COMMON_REGEX}" +REGEX_URI:pn-python-markupsafe = "https://pypi.python.org/pypi/MarkupSafe" +REGEX:pn-python-markupsafe = "/MarkupSafe/${COMMON_REGEX}" +REGEX_URI:pn-python-mccabe = "https://pypi.python.org/pypi/mccabe" +REGEX:pn-python-mccabe = "/mccabe/${COMMON_REGEX}" +REGEX_URI:pn-python-memcache = "https://pypi.python.org/pypi/pymemcache" +REGEX:pn-python-memcache = "/pymemcache/${COMMON_REGEX}" +REGEX_URI:pn-python-memcached = "https://pypi.python.org/pypi/" +REGEX:pn-python-memcached = "//${COMMON_REGEX}" +REGEX_URI:pn-python-mimeparse = "https://pypi.python.org/pypi/python-mimeparse" +REGEX:pn-python-mimeparse = "/python-mimeparse/${COMMON_REGEX}" +REGEX_URI:pn-python-mock = "https://pypi.python.org/pypi/mock" +REGEX:pn-python-mock = "/mock/${COMMON_REGEX}" +REGEX_URI:pn-python-mox = "https://pypi.python.org/pypi/mox" +REGEX:pn-python-mox = "/mox/${COMMON_REGEX}" +REGEX_URI:pn-python-mox3 = "https://pypi.python.org/pypi/mox3" +REGEX:pn-python-mox3 = "/mox3/${COMMON_REGEX}" +REGEX_URI:pn-python-msgpack = "https://pypi.python.org/pypi/msgpack-python" +REGEX:pn-python-msgpack = "/msgpack-python/${COMMON_REGEX}" +REGEX_URI:pn-python-netaddr = "https://pypi.python.org/pypi/netaddr" +REGEX:pn-python-netaddr = "/netaddr/${COMMON_REGEX}" +REGEX_URI:pn-python-netifaces = "https://pypi.python.org/pypi/netifaces" +REGEX:pn-python-netifaces = "/netifaces/${COMMON_REGEX}" +REGEX_URI:pn-python-networkx = "https://pypi.python.org/pypi/networkx" +REGEX:pn-python-networkx = "/networkx/${COMMON_REGEX}" +REGEX_URI:pn-python-nose-exclude = "https://pypi.python.org/pypi/nose-exclude" +REGEX:pn-python-nose-exclude = "/nose-exclude/${COMMON_REGEX}" +REGEX_URI:pn-python-oauth2 = "https://pypi.python.org/pypi/oauth2" +REGEX:pn-python-oauth2 = "/oauth2/${COMMON_REGEX}" +REGEX_URI:pn-python-oauthlib = "https://pypi.python.org/pypi/oauthlib" +REGEX:pn-python-oauthlib = "/oauthlib/${COMMON_REGEX}" +REGEX_URI:pn-python-openstackclient = "https://pypi.python.org/pypi/python-openstackclient" +REGEX:pn-python-openstackclient = "/python-openstackclient/${COMMON_REGEX}" +REGEX_URI:pn-python-openstack-nose = "https://pypi.python.org/pypi/openstack.nose_plugin" +REGEX:pn-python-openstack-nose = "/openstack.nose_plugin/${COMMON_REGEX}" +REGEX_URI:pn-python-oslo.concurrency = "https://pypi.python.org/pypi/oslo.concurrency" +REGEX:pn-python-oslo.concurrency = "/oslo.concurrency/${COMMON_REGEX}" +REGEX_URI:pn-python-oslo.config = "https://pypi.python.org/pypi/oslo.config" +REGEX:pn-python-oslo.config = "/oslo.config/${COMMON_REGEX}" +REGEX_URI:pn-python-oslo.db = "https://pypi.python.org/pypi/oslo.db" +REGEX:pn-python-oslo.db = "/oslo.db/${COMMON_REGEX}" +REGEX_URI:pn-python-oslo.i18n = "https://pypi.python.org/pypi/oslo.i18n" +REGEX:pn-python-oslo.i18n = "/oslo.i18n/${COMMON_REGEX}" +REGEX_URI:pn-python-oslo.middleware = "https://pypi.python.org/pypi/oslo.middleware" +REGEX:pn-python-oslo.middleware = "/oslo.middleware/${COMMON_REGEX}" +REGEX_URI:pn-python-oslo.rootwrap = "https://pypi.python.org/pypi/oslo.rootwrap" +REGEX:pn-python-oslo.rootwrap = "/oslo.rootwrap/${COMMON_REGEX}" +REGEX_URI:pn-python-oslotest = "https://pypi.python.org/pypi/oslotest" +REGEX:pn-python-oslotest = "/oslotest/${COMMON_REGEX}" +REGEX_URI:pn-python-osprofiler = "https://pypi.python.org/pypi/osprofiler" +REGEX:pn-python-osprofiler = "/osprofiler/${COMMON_REGEX}" +REGEX_URI:pn-python-pam = "https://pypi.python.org/pypi/pam" +REGEX:pn-python-pam = "/pam/${COMMON_REGEX}" +REGEX_URI:pn-python-paramiko = "https://pypi.python.org/pypi/paramiko" +REGEX:pn-python-paramiko = "/paramiko/${COMMON_REGEX}" +REGEX_URI:pn-python-passlib = "https://pypi.python.org/pypi/passlib" +REGEX:pn-python-passlib = "/passlib/${COMMON_REGEX}" +REGEX_URI:pn-python-paste = "https://pypi.python.org/pypi/Paste" +REGEX:pn-python-paste = "/Paste/${COMMON_REGEX}" +REGEX_URI:pn-python-pastedeploy = "https://pypi.python.org/pypi/PasteDeploy" +REGEX:pn-python-pastedeploy = "/PasteDeploy/${COMMON_REGEX}" +REGEX_URI:pn-python-pbr = "https://pypi.python.org/pypi/pbr" +REGEX:pn-python-pbr = "/pbr/${COMMON_REGEX}" +REGEX_URI:pn-python-pecan = "https://pypi.python.org/pypi/pecan" +REGEX:pn-python-pecan = "/pecan/${COMMON_REGEX}" +REGEX_URI:pn-python-pep8 = "https://pypi.python.org/pypi/pep8" +REGEX:pn-python-pep8 = "/pep8/${COMMON_REGEX}" +REGEX_URI:pn-python-pexpect = "https://pypi.python.org/pypi/pexpect" +REGEX:pn-python-pexpect = "/pexpect/${COMMON_REGEX}" +REGEX_URI:pn-python-pint = "https://pypi.python.org/pypi/Pint" +REGEX:pn-python-pint = "/Pint/${COMMON_REGEX}" +REGEX_URI:pn-python-ply = "https://pypi.python.org/pypi/ply" +REGEX:pn-python-ply = "/ply/${COMMON_REGEX}" +REGEX_URI:pn-python-posix-ipc = "https://pypi.python.org/pypi/posix_ipc" +REGEX:pn-python-posix-ipc = "/posix_ipc/${COMMON_REGEX}" +REGEX_URI:pn-python-prettytable = "https://pypi.python.org/pypi/prettytable" +REGEX:pn-python-prettytable = "/prettytable/${COMMON_REGEX}" +REGEX_URI:pn-python-psycopg2 = "https://pypi.python.org/pypi/psycopg2" +REGEX:pn-python-psycopg2 = "/psycopg2/${COMMON_REGEX}" +REGEX_URI:pn-python-py = "https://pypi.python.org/pypi/py" +REGEX:pn-python-py = "/py/${COMMON_REGEX}" +REGEX_URI:pn-python-pyasn1 = "https://pypi.python.org/pypi/pyasn1" +REGEX:pn-python-pyasn1 = "/pyasn1/${COMMON_REGEX}" +REGEX_URI:pn-python-pycadf = "https://pypi.python.org/pypi/pycadf" +REGEX:pn-python-pycadf = "/pycadf/${COMMON_REGEX}" +REGEX_URI:pn-python-pycrypto = "https://pypi.python.org/pypi/pycrypto" +REGEX:pn-python-pycrypto = "/pycrypto/${COMMON_REGEX}" +REGEX_URI:pn-python-pyflakes = "https://pypi.python.org/pypi/pyflakes" +REGEX:pn-python-pyflakes = "/pyflakes/${COMMON_REGEX}" +REGEX_URI:pn-python-pymongo = "https://pypi.python.org/pypi/pymongo" +REGEX:pn-python-pymongo = "/pymongo/${COMMON_REGEX}" +REGEX_URI:pn-python-pyparsing = "https://pypi.python.org/pypi/pyparsing" +REGEX:pn-python-pyparsing = "/pyparsing/${COMMON_REGEX}" +REGEX_URI:pn-python-pysaml2 = "https://pypi.python.org/pypi/pysaml2" +REGEX:pn-python-pysaml2 = "/pysaml2/${COMMON_REGEX}" +REGEX_URI:pn-python-pyscss = "https://pypi.python.org/pypi/pyScss" +REGEX:pn-python-pyscss = "/pyScss/${COMMON_REGEX}" +REGEX_URI:pn-python-pysnmp = "https://pypi.python.org/pypi/pysnmp" +REGEX:pn-python-pysnmp = "/pysnmp/${COMMON_REGEX}" +REGEX_URI:pn-python-pysqlite = "https://pypi.python.org/pypi/pysqlite" +REGEX:pn-python-pysqlite = "/pysqlite/${COMMON_REGEX}" +REGEX_URI:pn-python-pytest = "https://pypi.python.org/pypi/pytest" +REGEX:pn-python-pytest = "/pytest/${COMMON_REGEX}" +REGEX_URI:pn-python-pytz = "https://pypi.python.org/pypi/pytz" +REGEX:pn-python-pytz = "/pytz/${COMMON_REGEX}" +REGEX_URI:pn-python-pyudev = "https://pypi.python.org/pypi/pyudev" +REGEX:pn-python-pyudev = "/pyudev/${COMMON_REGEX}" +REGEX_URI:pn-python-retrying = "https://pypi.python.org/pypi/retrying" +REGEX:pn-python-retrying = "/retrying/${COMMON_REGEX}" +REGEX_URI:pn-python-rfc3986 = "https://pypi.python.org/pypi/rfc3986" +REGEX:pn-python-rfc3986 = "/rfc3986/${COMMON_REGEX}" +REGEX_URI:pn-python-routes = "https://pypi.python.org/pypi/Routes" +REGEX:pn-python-routes = "/Routes/${COMMON_REGEX}" +REGEX_URI:pn-python-rtslib-fb = "https://pypi.python.org/pypi/rtslib-fb" +REGEX:pn-python-rtslib-fb = "/rtslib-fb/${COMMON_REGEX}" +REGEX_URI:pn-python-setuptools-git = "https://pypi.python.org/pypi/setuptools-git" +REGEX:pn-python-setuptools-git = "/setuptools-git/${COMMON_REGEX}" +REGEX_URI:pn-python-simplegeneric = "https://pypi.python.org/pypi/simplegeneric" +REGEX:pn-python-simplegeneric = "/simplegeneric/${COMMON_REGEX}" +REGEX_URI:pn-python-singledispatch = "https://pypi.python.org/pypi/singledispatch" +REGEX:pn-python-singledispatch = "/singledispatch/${COMMON_REGEX}" +REGEX_URI:pn-python-sqlalchemy-migrate = "https://pypi.python.org/pypi/sqlalchemy-migrate" +REGEX:pn-python-sqlalchemy-migrate = "/sqlalchemy-migrate/${COMMON_REGEX}" +REGEX_URI:pn-python-stevedore = "https://pypi.python.org/pypi/stevedore" +REGEX:pn-python-stevedore = "/stevedore/${COMMON_REGEX}" +REGEX_URI:pn-python-subunit = "https://pypi.python.org/pypi/python-subunit" +REGEX:pn-python-subunit = "/python-subunit/${COMMON_REGEX}" +REGEX_URI:pn-python-sysv-ipc = "https://pypi.python.org/pypi/sysv_ipc" +REGEX:pn-python-sysv-ipc = "/sysv_ipc/${COMMON_REGEX}" +REGEX_URI:pn-python-tempita = "https://pypi.python.org/pypi/Tempita" +REGEX:pn-python-tempita = "/Tempita/(?P<pver>\d+\.\d+\.\d((\w)*)?)" +REGEX_URI:pn-python-termcolor = "https://pypi.python.org/pypi/termcolor" +REGEX:pn-python-termcolor = "/termcolor/${COMMON_REGEX}" +REGEX_URI:pn-python-testrepository = "https://pypi.python.org/pypi/testrepository" +REGEX:pn-python-testrepository = "/testrepository/${COMMON_REGEX}" +REGEX_URI:pn-python-testresources = "https://pypi.python.org/pypi/testresources" +REGEX:pn-python-testresources = "/testresources/${COMMON_REGEX}" +REGEX_URI:pn-python-testscenarios = "https://pypi.python.org/pypi/testscenarios" +REGEX:pn-python-testscenarios = "/testscenarios/${COMMON_REGEX}" +REGEX_URI:pn-python-testtools = "https://pypi.python.org/pypi/testtools" +REGEX:pn-python-testtools = "/testtools/${COMMON_REGEX}" +REGEX_URI:pn-python-thrift = "https://pypi.python.org/pypi/thrift" +REGEX:pn-python-thrift = "/thrift/${COMMON_REGEX}" +REGEX_URI:pn-python-tooz = "https://pypi.python.org/pypi/tooz" +REGEX:pn-python-tooz = "/tooz/${COMMON_REGEX}" +REGEX_URI:pn-python-tox = "https://pypi.python.org/pypi/tox" +REGEX:pn-python-tox = "/tox/${COMMON_REGEX}" +REGEX_URI:pn-python-virtualenv = "https://pypi.python.org/pypi/virtualenv" +REGEX:pn-python-virtualenv = "/virtualenv/${COMMON_REGEX}" +REGEX_URI:pn-python-waitress = "https://pypi.python.org/pypi/waitress" +REGEX:pn-python-waitress = "/waitress/${COMMON_REGEX}" +REGEX_URI:pn-python-warlock = "https://pypi.python.org/pypi/warlock" +REGEX:pn-python-warlock = "/warlock/${COMMON_REGEX}" +REGEX_URI:pn-python-websockify = "https://pypi.python.org/pypi/websockify" +REGEX:pn-python-websockify = "/websockify/${COMMON_REGEX}" +REGEX_URI:pn-python-webtest = "https://pypi.python.org/pypi/WebTest" +REGEX:pn-python-webtest = "/WebTest/${COMMON_REGEX}" +REGEX_URI:pn-python-wsgiref = "https://pypi.python.org/pypi/wsgiref" +REGEX:pn-python-wsgiref = "/wsgiref/${COMMON_REGEX}" +REGEX_URI:pn-python-wsme = "https://pypi.python.org/pypi/WSME" +REGEX:pn-python-wsme = "/WSME/${COMMON_REGEX}" +REGEX_URI:pn-python-xattr = "https://pypi.python.org/pypi/xattr" +REGEX:pn-python-xattr = "/xattr/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic = "https://pypi.python.org/pypi/XStatic" +REGEX:pn-python-xstatic = "/XStatic/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-angular = "https://pypi.python.org/pypi/XStatic-Angular" +REGEX:pn-python-xstatic-angular = "/XStatic-Angular/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-angular-bootstrap = "https://pypi.python.org/pypi/XStatic-Angular-Bootstrap" +REGEX:pn-python-xstatic-angular-bootstrap = "/XStatic-Angular-Bootstrap/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-angular-cookies = "https://pypi.python.org/pypi/XStatic-Angular-Cookies" +REGEX:pn-python-xstatic-angular-cookies = "/XStatic-Angular-Cookies/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-angular-mock = "https://pypi.python.org/pypi/XStatic-Angular-Mock" +REGEX:pn-python-xstatic-angular-mock = "/XStatic-Angular-Mock/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-bootstrap-datepicker = "https://pypi.python.org/pypi/XStatic-Bootstrap-Datepicker" +REGEX:pn-python-xstatic-bootstrap-datepicker = "/XStatic-Bootstrap-Datepicker/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-bootstrap-scss = "https://pypi.python.org/pypi/XStatic-Bootstrap-SCSS" +REGEX:pn-python-xstatic-bootstrap-scss = "/XStatic-Bootstrap-SCSS/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-d3 = "https://pypi.python.org/pypi/XStatic-D3" +REGEX:pn-python-xstatic-d3 = "/XStatic-D3/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-font-awesome = "https://pypi.python.org/pypi/XStatic-Font-Awesome" +REGEX:pn-python-xstatic-font-awesome = "/XStatic-Font-Awesome/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-hogan = "https://pypi.python.org/pypi/XStatic-Hogan" +REGEX:pn-python-xstatic-hogan = "/XStatic-Hogan/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jasmine = "https://pypi.python.org/pypi/XStatic-Jasmine" +REGEX:pn-python-xstatic-jasmine = "/XStatic-Jasmine/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jquery = "https://pypi.python.org/pypi/XStatic-jQuery" +REGEX:pn-python-xstatic-jquery = "/XStatic-jQuery/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jquery-migrate = "https://pypi.python.org/pypi/XStatic-JQuery-Migrate" +REGEX:pn-python-xstatic-jquery-migrate = "/XStatic-JQuery-Migrate/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jquery-quicksearch = "https://pypi.python.org/pypi/XStatic-JQuery.quicksearch" +REGEX:pn-python-xstatic-jquery-quicksearch = "/XStatic-JQuery.quicksearch/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jquery-tablesorter = "https://pypi.python.org/pypi/XStatic-JQuery.TableSorter" +REGEX:pn-python-xstatic-jquery-tablesorter = "/XStatic-JQuery.TableSorter/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jquery-ui = "https://pypi.python.org/pypi/XStatic-jquery-ui" +REGEX:pn-python-xstatic-jquery-ui = "/XStatic-jquery-ui/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-jsencrypt = "https://pypi.python.org/pypi/XStatic-JSEncrypt" +REGEX:pn-python-xstatic-jsencrypt = "/XStatic-JSEncrypt/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-qunit = "https://pypi.python.org/pypi/XStatic-QUnit" +REGEX:pn-python-xstatic-qunit = "/XStatic-QUnit/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-rickshaw = "https://pypi.python.org/pypi/XStatic-Rickshaw" +REGEX:pn-python-xstatic-rickshaw = "/XStatic-Rickshaw/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-smart-table = "https://pypi.python.org/pypi/XStatic-smart-table" +REGEX:pn-python-xstatic-smart-table = "/XStatic-smart-table/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-spin = "https://pypi.python.org/pypi/XStatic-Spin" +REGEX:pn-python-xstatic-spin = "/XStatic-Spin/${COMMON_REGEX}" +REGEX_URI:pn-python-xstatic-term.js = "https://pypi.python.org/pypi/XStatic-term.js" +REGEX:pn-python-xstatic-term.js = "/XStatic-term.js/${COMMON_REGEX}" +REGEX_URI:pn-python-zake = "https://pypi.python.org/pypi/zake" +REGEX:pn-python-zake = "/zake/${COMMON_REGEX}" # GIT GITTAGREGEX_COMMON = "(?P<pver>\d+\.\d+\.(\d\.?)*)" -GITTAGREGEX_pn-python-glanceclient = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-python-keystoneclient = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-python-neutronclient = "(?P<pver>\d+\.\d+\.(\d\.?)+)" -GITTAGREGEX_pn-python-novaclient = "${GITTAGREGEX_COMMON}" +GITTAGREGEX:pn-python-glanceclient = "${GITTAGREGEX_COMMON}" +GITTAGREGEX:pn-python-keystoneclient = "${GITTAGREGEX_COMMON}" +GITTAGREGEX:pn-python-neutronclient = "(?P<pver>\d+\.\d+\.(\d\.?)+)" +GITTAGREGEX:pn-python-novaclient = "${GITTAGREGEX_COMMON}" GITTAGREGEX_BETA = "(?P<pver>\d+\.\d+(\.\d+(b\d)?)?)" -GITTAGREGEX_pn-python-barbican = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-ceilometer = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-cinder = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-glance = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-heat = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-horizon = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-keystone = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-neutron = "${GITTAGREGEX_BETA}" -GITTAGREGEX_pn-python-nova = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-barbican = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-ceilometer = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-cinder = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-glance = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-heat = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-horizon = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-keystone = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-neutron = "${GITTAGREGEX_BETA}" +GITTAGREGEX:pn-python-nova = "${GITTAGREGEX_BETA}" diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf index b98a2759..b035adf7 100644 --- a/meta-openstack/conf/layer.conf +++ b/meta-openstack/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "openstack-layer" BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_openstack-layer = "5" -LAYERSERIES_COMPAT_openstack-layer = "zeus dunfell" +LAYERSERIES_COMPAT_openstack-layer = "scarthgap" BB_DANGLINGAPPENDS_WARNONLY ?= "true" LAYERDEPENDS_openstack-layer = " \ diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch new file mode 100644 index 00000000..ef11366b --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch @@ -0,0 +1,53 @@ +From 569886070a273e914f2662d10b03e1767d488aee Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 18 May 2022 11:32:29 +0900 +Subject: [PATCH] Fix /usr/bin/sed to sed. + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + doc/Makefile | 2 +- + etc/Makefile | 2 +- + utils/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 9ed025d..e121270 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) + TOPDIR = .. + endif + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + + DESTDIR ?= +diff --git a/etc/Makefile b/etc/Makefile +index d065319..2d98027 100644 +--- a/etc/Makefile ++++ b/etc/Makefile +@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d + + HOMEDIR ?= $(etcdir)/iscsi + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + + SYSTEMD_SOURCE_FILES = iscsid.socket iscsiuio.socket +diff --git a/utils/Makefile b/utils/Makefile +index a7eb352..15539eb 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -7,7 +7,7 @@ + # from the top-level make file. + # + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + CHMOD = chmod + +-- +2.25.1 diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch new file mode 100644 index 00000000..bdb9e45f --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch @@ -0,0 +1,25 @@ +From 69fa594af5a09e356319cc0ec2e71809ac964d9b Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 18 May 2022 10:28:53 +0900 +Subject: [PATCH] Makefile: Fix build error of cross build. + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d2f143b..127ba90 100644 +--- a/Makefile ++++ b/Makefile +@@ -69,7 +69,7 @@ user: iscsiuio/Makefile + @echo "Read README file for detailed information." + + iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in +- cd iscsiuio; ./configure $(WITHOUT_ARG) --sbindir=$(SBINDIR) ++ cd iscsiuio; ./configure $(WITHOUT_ARG) --sbindir=$(SBINDIR) $(CONFIGURE_ARGS) + + iscsiuio/configure: iscsiuio/configure.ac iscsiuio/Makefile.am + cd iscsiuio; autoreconf --install +-- +2.25.1 diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch new file mode 100644 index 00000000..8cea597e --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch @@ -0,0 +1,25 @@ +From 280fbda492256d2ef70c6d377e8bd8935e7a4f9c Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Fri, 20 May 2022 17:59:03 +0900 +Subject: [PATCH] Modified path of systemd service from /usr/lib to /lib. + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + etc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/Makefile b/etc/Makefile +index 2d98027..d24fd03 100644 +--- a/etc/Makefile ++++ b/etc/Makefile +@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) + TOPDIR = .. + endif + +-prefix = /usr ++prefix = + DESTDIR ?= + SBINDIR ?= /sbin + +-- +2.25.1 diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch index 206da482..8eec2dc5 100644 --- a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-fix-build-error-of-cross-build.patch @@ -1,30 +1,30 @@ -From 943a321104a5b2c4ac25bdb2ae81b5b208e3973c Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Tue, 18 Aug 2015 10:29:35 +0900 +From 2ba83ff539c18d02f8e4b4ce7903a5b46f364609 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 8 Jul 2021 15:06:27 +0900 Subject: [PATCH] fix build error of cross build The error likes as following | configure: error: cannot run C compiled programs. | If you meant to cross compile, use `--host'. -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index c5d9700..1f31e43 100644 +index 7f52cc8..cadbc47 100644 --- a/Makefile +++ b/Makefile -@@ -42,7 +42,7 @@ user: utils/open-isns/Makefile +@@ -78,7 +78,7 @@ user: iscsiuio/Makefile @echo "Read README file for detailed information." - utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in -- cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no -+ cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no ${CONFIGURE_ARGS} + iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in +- cd iscsiuio; ./configure $(WITHOUT_ARG) ++ cd iscsiuio; ./configure $(WITHOUT_ARG) $(CONFIGURE_ARGS) - kernel: force - $(MAKE) -C kernel + iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile.am + cd iscsiuio; autoreconf --install -- -1.8.4.2 +2.25.1 diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb index 8d514601..69412349 100644 --- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-kernel_2.0-873.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." HOMEPAGE = "http://www.open-iscsi.org/" LICENSE = "GPL" -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR:append = "a" PR = "r2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb deleted file mode 100644 index 4c9326ee..00000000 --- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.0-873.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." -HOMEPAGE = "http://www.open-iscsi.org/" -LICENSE = "GPLv2" -PR = "r1" - -inherit systemd - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ - file://0001-fix-build-error-of-cross-build.patch \ - file://open-iscsi \ - file://initiatorname.iscsi \ - " - - -S = "${WORKDIR}/open-iscsi-${PV}" -TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'" - -do_compile () { - oe_runmake user -} - -do_install () { - oe_runmake DESTDIR="${D}" install_user - cp -f "${WORKDIR}/open-iscsi" "${D}/etc/init.d/" - install -m 0644 ${WORKDIR}/initiatorname.iscsi ${D}/etc/iscsi/initiatorname.iscsi -} - - -SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7" -SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9" - -# systemd support -PACKAGES =+ "${PN}-systemd" -SRC_URI_append = " file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - " -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-systemd += "${PN}" -FILES_${PN}-systemd += " ${base_libdir}/systemd \ - ${sysconfdir}/default/iscsi-initiator \ - " -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "iscsi-initiator.service iscsi-initiator-targets.service" - -do_install_append () { - install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/iscsi-initiator.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator-targets.service ${D}${systemd_unitdir}/system/ -} diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb new file mode 100644 index 00000000..1f84508f --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." +HOMEPAGE = "http://www.open-iscsi.org/" +LICENSE = "GPL-2.0-only" +PR = "r1" + +inherit autotools systemd pkgconfig + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "kmod openssl util-linux open-isns" +DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=master \ + file://0001-Makefile-Fix-build-error-of-cross-build.patch \ + file://0001-Fix-usr-bin-sed-to-sed.patch \ + file://0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch \ + " + +SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f" + +S = "${WORKDIR}/git" +B = "${S}" + +PARALLEL_MAKEINST = "" +TARGET_CC_ARCH += "${LDFLAGS}" +EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}' MFLAGS='' LIB_DIR=${libdir}" +RDEPENDS:${PN} += "bash" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "iscsi.service \ + iscsid.socket \ + iscsiuio.socket \ + iscsid.service \ + iscsi-init.service \ + iscsiuio.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" +FILES:${PN} += " \ + ${systemd_system_unitdir}/iscsi.service \ + ${systemd_system_unitdir}/iscsid.socket \ + ${systemd_system_unitdir}/iscsiuio.socket \ + ${systemd_system_unitdir}/iscsid.service \ + ${systemd_system_unitdir}/iscsi-init.service \ + ${systemd_system_unitdir}/iscsiuio.service \ + ${systemd_unitdir}/system-generators/ibft-rule-generator \ +" + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${exec_prefix} LIBDIR=${libdir} sbindir=${sbindir} SBINDIR=${sbindir} systemddir=${systemd_unitdir} +} diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc b/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc index 5c0d724f..0244ae32 100644 --- a/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc +++ b/meta-openstack/recipes-connectivity/openssh/openssh_openstack.inc @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://mcs-sshd" SRC_URI += "file://mcs-sshd_config" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config diff --git a/meta-openstack/recipes-core/base-files/base-files_openstack.inc b/meta-openstack/recipes-core/base-files/base-files_openstack.inc index 0a1b1604..d69bc792 100644 --- a/meta-openstack/recipes-core/base-files/base-files_openstack.inc +++ b/meta-openstack/recipes-core/base-files/base-files_openstack.inc @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://nsswitch.conf" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" PACKAGECONFIG[OpenLDAP] = ",,,nss-pam-ldapd" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then install -m 755 -d ${D}/etc/ install -m 644 ${WORKDIR}/nsswitch.conf ${D}/etc/ diff --git a/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc b/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc index 21749974..39308672 100644 --- a/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc +++ b/meta-openstack/recipes-core/initscripts/initscripts_openstack.inc @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { echo >> ${D}${sysconfdir}/init.d/functions echo init_is_upstart \(\) \{ >> ${D}${sysconfdir}/init.d/functions diff --git a/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc b/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc index b6a9c3c2..f3e66652 100644 --- a/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc +++ b/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/postgresql:" +FILESEXTRAPATHS:prepend := "${THISDIR}/postgresql:" SRC_URI += " \ file://postgresql-init \ @@ -7,12 +7,12 @@ SRC_URI += " \ inherit identity hosts -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" # default DB_DATADIR ?= "/var/lib/postgres/data" -do_install_append() { +do_install:append() { D_DEST_DIR=${D}${sysconfdir}/postgresql install -d ${D_DEST_DIR} @@ -35,7 +35,7 @@ do_install_append() { sed -e "s:%SYSCONFIGDIR%:${sysconfdir}:g" -i ${PG_INIT_SERVICE_FILE} # Update PGDATA throughout - files="${D}${localstatedir}/lib/${BPN}/.bash_profile" + files="${D}${localstatedir}/lib/${BPN}/.profile" files="$files ${D}${systemd_unitdir}/system/postgresql.service" files="$files ${D}${bindir}/${BPN}-setup" files="$files ${D}${sysconfdir}/init.d/${BPN}-server" @@ -53,8 +53,8 @@ do_install_append() { PACKAGES += " ${PN}-setup" SYSTEMD_PACKAGES += "${PN}-setup" -SYSTEMD_SERVICE_${PN}-setup = "postgresql-init.service" +SYSTEMD_SERVICE:${PN}-setup = "postgresql-init.service" -FILES_${PN}-setup = " \ +FILES:${PN}-setup = " \ ${systemd_unitdir}/system \ " diff --git a/meta-openstack/recipes-devtools/erlang/erlang-R16B03-1-manifest.inc b/meta-openstack/recipes-devtools/erlang/erlang-R16B03-1-manifest.inc index 1f992436..a9a5353a 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang-R16B03-1-manifest.inc +++ b/meta-openstack/recipes-devtools/erlang/erlang-R16B03-1-manifest.inc @@ -8,1108 +8,1108 @@ PROVIDES+="${PN} ${PN}-appmon ${PN}-appmon-dbg ${PN}-appmon-dev ${PN}-appmon-sta PACKAGES="${PN}-dbg ${PN}-xmerl-staticdev ${PN}-xmerl-dev ${PN}-xmerl-dbg ${PN}-xmerl ${PN}-webtool-staticdev ${PN}-webtool-dev ${PN}-webtool-dbg ${PN}-webtool ${PN}-typer-staticdev ${PN}-typer-dev ${PN}-typer-dbg ${PN}-typer ${PN}-tv-staticdev ${PN}-tv-dev ${PN}-tv-dbg ${PN}-tv ${PN}-tools-staticdev ${PN}-tools-dev ${PN}-tools-dbg ${PN}-tools ${PN}-toolbar-staticdev ${PN}-toolbar-dev ${PN}-toolbar-dbg ${PN}-toolbar ${PN}-test-server-staticdev ${PN}-test-server-dev ${PN}-test-server-dbg ${PN}-test-server ${PN}-syntax-tools-staticdev ${PN}-syntax-tools-dev ${PN}-syntax-tools-dbg ${PN}-syntax-tools ${PN}-stdlib-staticdev ${PN}-stdlib-doc ${PN}-stdlib-dev ${PN}-stdlib-dbg ${PN}-stdlib ${PN}-staticdev ${PN}-ssl-staticdev ${PN}-ssl-dev ${PN}-ssl-dbg ${PN}-ssl ${PN}-ssh-staticdev ${PN}-ssh-dev ${PN}-ssh-dbg ${PN}-ssh ${PN}-snmp-staticdev ${PN}-snmp-dev ${PN}-snmp-dbg ${PN}-snmp ${PN}-sasl-staticdev ${PN}-sasl-doc ${PN}-sasl-dev ${PN}-sasl-dbg ${PN}-sasl ${PN}-runtime-tools-staticdev ${PN}-runtime-tools-dev ${PN}-runtime-tools-dbg ${PN}-runtime-tools ${PN}-reltool-staticdev ${PN}-reltool-dev ${PN}-reltool-dbg ${PN}-reltool ${PN}-public-key-staticdev ${PN}-public-key-dev ${PN}-public-key-dbg ${PN}-public-key ${PN}-pman-staticdev ${PN}-pman-dev ${PN}-pman-dbg ${PN}-pman ${PN}-percept-staticdev ${PN}-percept-dev ${PN}-percept-dbg ${PN}-percept ${PN}-parsetools-staticdev ${PN}-parsetools-dev ${PN}-parsetools-dbg ${PN}-parsetools ${PN}-otp-mibs-staticdev ${PN}-otp-mibs-dev ${PN}-otp-mibs-dbg ${PN}-otp-mibs ${PN}-os-mon-staticdev ${PN}-os-mon-dev ${PN}-os-mon-dbg ${PN}-os-mon ${PN}-orber-staticdev ${PN}-orber-dev ${PN}-orber-dbg ${PN}-orber ${PN}-observer-staticdev ${PN}-observer-dev ${PN}-observer-dbg ${PN}-observer ${PN}-mnesia-staticdev ${PN}-mnesia-dev ${PN}-mnesia-dbg ${PN}-mnesia ${PN}-megaco-staticdev ${PN}-megaco-dev ${PN}-megaco-dbg ${PN}-megaco ${PN}-kernel-staticdev ${PN}-kernel-doc ${PN}-kernel-dev ${PN}-kernel-dbg ${PN}-kernel ${PN}-jinterface-staticdev ${PN}-jinterface-dev ${PN}-jinterface-dbg ${PN}-jinterface ${PN}-inets-staticdev ${PN}-inets-dev ${PN}-inets-dbg ${PN}-inets ${PN}-ic-staticdev ${PN}-ic-dev ${PN}-ic-dbg ${PN}-ic ${PN}-hipe-staticdev ${PN}-hipe-dev ${PN}-hipe-dbg ${PN}-hipe ${PN}-gs-staticdev ${PN}-gs-dev ${PN}-gs-dbg ${PN}-gs ${PN}-eunit-staticdev ${PN}-eunit-dev ${PN}-eunit-dbg ${PN}-eunit ${PN}-et-staticdev ${PN}-et-dev ${PN}-et-dbg ${PN}-et ${PN}-erts-staticdev ${PN}-erts-dev ${PN}-erts-dbg ${PN}-erts ${PN}-erl-interface-staticdev ${PN}-erl-interface-dev ${PN}-erl-interface-dbg ${PN}-erl-interface ${PN}-erl-docgen-staticdev ${PN}-erl-docgen-dev ${PN}-erl-docgen-dbg ${PN}-erl-docgen ${PN}-eldap-staticdev ${PN}-eldap-dev ${PN}-eldap-dbg ${PN}-eldap ${PN}-edoc-staticdev ${PN}-edoc-dev ${PN}-edoc-dbg ${PN}-edoc ${PN}-doc ${PN}-diameter-staticdev ${PN}-diameter-dev ${PN}-diameter-dbg ${PN}-diameter ${PN}-dialyzer-staticdev ${PN}-dialyzer-dev ${PN}-dialyzer-dbg ${PN}-dialyzer ${PN}-dev ${PN}-debugger-staticdev ${PN}-debugger-dev ${PN}-debugger-dbg ${PN}-debugger ${PN}-crypto-staticdev ${PN}-crypto-dev ${PN}-crypto-dbg ${PN}-crypto ${PN}-costransactions-staticdev ${PN}-costransactions-dev ${PN}-costransactions-dbg ${PN}-costransactions ${PN}-costime-staticdev ${PN}-costime-dev ${PN}-costime-dbg ${PN}-costime ${PN}-cosproperty-staticdev ${PN}-cosproperty-dev ${PN}-cosproperty-dbg ${PN}-cosproperty ${PN}-cosnotification-staticdev ${PN}-cosnotification-dev ${PN}-cosnotification-dbg ${PN}-cosnotification ${PN}-cosfiletransfer-staticdev ${PN}-cosfiletransfer-dev ${PN}-cosfiletransfer-dbg ${PN}-cosfiletransfer ${PN}-coseventdomain-staticdev ${PN}-coseventdomain-dev ${PN}-coseventdomain-dbg ${PN}-coseventdomain ${PN}-cosevent-staticdev ${PN}-cosevent-dev ${PN}-cosevent-dbg ${PN}-cosevent ${PN}-compiler-staticdev ${PN}-compiler-dev ${PN}-compiler-dbg ${PN}-compiler ${PN}-common-test-staticdev ${PN}-common-test-dev ${PN}-common-test-dbg ${PN}-common-test ${PN}-asn1-staticdev ${PN}-asn1-dev ${PN}-asn1-dbg ${PN}-asn1 ${PN}-appmon-staticdev ${PN}-appmon-dev ${PN}-appmon-dbg ${PN}-appmon ${PN} ${PN}-modules" -ALLOW_EMPTY_${PN}-xmerl-staticdev="1" -DESCRIPTION_${PN}-xmerl-staticdev="" -RDEPENDS_${PN}-xmerl-staticdev="" -FILES_${PN}-xmerl-staticdev="${libdir}/erlang/lib/xmerl-*/lib/*.a ${libdir}/erlang/lib/xmerl-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-xmerl-dev="1" -DESCRIPTION_${PN}-xmerl-dev="" -RDEPENDS_${PN}-xmerl-dev="" -FILES_${PN}-xmerl-dev="${libdir}/erlang/lib/xmerl-*/src ${libdir}/erlang/lib/xmerl-*/include " - -ALLOW_EMPTY_${PN}-xmerl-dbg="1" -DESCRIPTION_${PN}-xmerl-dbg="" -RDEPENDS_${PN}-xmerl-dbg="" -FILES_${PN}-xmerl-dbg="${libdir}/erlang/lib/xmerl-*/bin/.debug ${libdir}/erlang/lib/xmerl-*/lib/.debug ${libdir}/erlang/lib/xmerl-*/priv/lib/.debug ${libdir}/erlang/lib/xmerl-*/priv/obj/.debug ${libdir}/erlang/lib/xmerl-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-xmerl="1" -DESCRIPTION_${PN}-xmerl="" -RDEPENDS_${PN}-xmerl="" -FILES_${PN}-xmerl="${libdir}/erlang/lib/xmerl-* " - -ALLOW_EMPTY_${PN}-webtool-staticdev="1" -DESCRIPTION_${PN}-webtool-staticdev="" -RDEPENDS_${PN}-webtool-staticdev="" -FILES_${PN}-webtool-staticdev="${libdir}/erlang/lib/webtool-*/lib/*.a ${libdir}/erlang/lib/webtool-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-webtool-dev="1" -DESCRIPTION_${PN}-webtool-dev="" -RDEPENDS_${PN}-webtool-dev="" -FILES_${PN}-webtool-dev="${libdir}/erlang/lib/webtool-*/src ${libdir}/erlang/lib/webtool-*/include " - -ALLOW_EMPTY_${PN}-webtool-dbg="1" -DESCRIPTION_${PN}-webtool-dbg="" -RDEPENDS_${PN}-webtool-dbg="" -FILES_${PN}-webtool-dbg="${libdir}/erlang/lib/webtool-*/bin/.debug ${libdir}/erlang/lib/webtool-*/lib/.debug ${libdir}/erlang/lib/webtool-*/priv/lib/.debug ${libdir}/erlang/lib/webtool-*/priv/obj/.debug ${libdir}/erlang/lib/webtool-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-webtool="1" -DESCRIPTION_${PN}-webtool="" -RDEPENDS_${PN}-webtool="" -FILES_${PN}-webtool="${libdir}/erlang/lib/webtool-* " - -ALLOW_EMPTY_${PN}-typer-staticdev="1" -DESCRIPTION_${PN}-typer-staticdev="" -RDEPENDS_${PN}-typer-staticdev="" -FILES_${PN}-typer-staticdev="${libdir}/erlang/lib/typer-*/lib/*.a ${libdir}/erlang/lib/typer-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-typer-dev="1" -DESCRIPTION_${PN}-typer-dev="" -RDEPENDS_${PN}-typer-dev="" -FILES_${PN}-typer-dev="${libdir}/erlang/lib/typer-*/src ${libdir}/erlang/lib/typer-*/include " - -ALLOW_EMPTY_${PN}-typer-dbg="1" -DESCRIPTION_${PN}-typer-dbg="" -RDEPENDS_${PN}-typer-dbg="" -FILES_${PN}-typer-dbg="${libdir}/erlang/lib/typer-*/bin/.debug ${libdir}/erlang/lib/typer-*/lib/.debug ${libdir}/erlang/lib/typer-*/priv/lib/.debug ${libdir}/erlang/lib/typer-*/priv/obj/.debug ${libdir}/erlang/lib/typer-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-typer="1" -DESCRIPTION_${PN}-typer="" -RDEPENDS_${PN}-typer="" -FILES_${PN}-typer="${libdir}/erlang/lib/typer-* " - -ALLOW_EMPTY_${PN}-tv-staticdev="1" -DESCRIPTION_${PN}-tv-staticdev="" -RDEPENDS_${PN}-tv-staticdev="" -FILES_${PN}-tv-staticdev="${libdir}/erlang/lib/tv-*/lib/*.a ${libdir}/erlang/lib/tv-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-tv-dev="1" -DESCRIPTION_${PN}-tv-dev="" -RDEPENDS_${PN}-tv-dev="" -FILES_${PN}-tv-dev="${libdir}/erlang/lib/tv-*/src ${libdir}/erlang/lib/tv-*/include " - -ALLOW_EMPTY_${PN}-tv-dbg="1" -DESCRIPTION_${PN}-tv-dbg="" -RDEPENDS_${PN}-tv-dbg="" -FILES_${PN}-tv-dbg="${libdir}/erlang/lib/tv-*/bin/.debug ${libdir}/erlang/lib/tv-*/lib/.debug ${libdir}/erlang/lib/tv-*/priv/lib/.debug ${libdir}/erlang/lib/tv-*/priv/obj/.debug ${libdir}/erlang/lib/tv-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-tv="1" -DESCRIPTION_${PN}-tv="" -RDEPENDS_${PN}-tv="" -FILES_${PN}-tv="${libdir}/erlang/lib/tv-* " - -ALLOW_EMPTY_${PN}-tools-staticdev="1" -DESCRIPTION_${PN}-tools-staticdev="" -RDEPENDS_${PN}-tools-staticdev="" -FILES_${PN}-tools-staticdev="${libdir}/erlang/lib/tools-*/lib/*.a ${libdir}/erlang/lib/tools-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-tools-dev="1" -DESCRIPTION_${PN}-tools-dev="" -RDEPENDS_${PN}-tools-dev="" -FILES_${PN}-tools-dev="${libdir}/erlang/lib/tools-*/src ${libdir}/erlang/lib/tools-*/include " - -ALLOW_EMPTY_${PN}-tools-dbg="1" -DESCRIPTION_${PN}-tools-dbg="" -RDEPENDS_${PN}-tools-dbg="" -FILES_${PN}-tools-dbg="${libdir}/erlang/lib/tools-*/bin/.debug ${libdir}/erlang/lib/tools-*/lib/.debug ${libdir}/erlang/lib/tools-*/priv/lib/.debug ${libdir}/erlang/lib/tools-*/priv/obj/.debug ${libdir}/erlang/lib/tools-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-tools="1" -DESCRIPTION_${PN}-tools="" -RDEPENDS_${PN}-tools="" -FILES_${PN}-tools="${libdir}/erlang/lib/tools-* " - -ALLOW_EMPTY_${PN}-toolbar-staticdev="1" -DESCRIPTION_${PN}-toolbar-staticdev="" -RDEPENDS_${PN}-toolbar-staticdev="" -FILES_${PN}-toolbar-staticdev="${libdir}/erlang/lib/toolbar-*/lib/*.a ${libdir}/erlang/lib/toolbar-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-toolbar-dev="1" -DESCRIPTION_${PN}-toolbar-dev="" -RDEPENDS_${PN}-toolbar-dev="" -FILES_${PN}-toolbar-dev="${libdir}/erlang/lib/toolbar-*/src ${libdir}/erlang/lib/toolbar-*/include " - -ALLOW_EMPTY_${PN}-toolbar-dbg="1" -DESCRIPTION_${PN}-toolbar-dbg="" -RDEPENDS_${PN}-toolbar-dbg="" -FILES_${PN}-toolbar-dbg="${libdir}/erlang/lib/toolbar-*/bin/.debug ${libdir}/erlang/lib/toolbar-*/lib/.debug ${libdir}/erlang/lib/toolbar-*/priv/lib/.debug ${libdir}/erlang/lib/toolbar-*/priv/obj/.debug ${libdir}/erlang/lib/toolbar-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-toolbar="1" -DESCRIPTION_${PN}-toolbar="" -RDEPENDS_${PN}-toolbar="" -FILES_${PN}-toolbar="${libdir}/erlang/lib/toolbar-* " - -ALLOW_EMPTY_${PN}-test-server-staticdev="1" -DESCRIPTION_${PN}-test-server-staticdev="" -RDEPENDS_${PN}-test-server-staticdev="" -FILES_${PN}-test-server-staticdev="${libdir}/erlang/lib/test_server-*/lib/*.a ${libdir}/erlang/lib/test_server-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-test-server-dev="1" -DESCRIPTION_${PN}-test-server-dev="" -RDEPENDS_${PN}-test-server-dev="" -FILES_${PN}-test-server-dev="${libdir}/erlang/lib/test_server-*/src ${libdir}/erlang/lib/test_server-*/include " - -ALLOW_EMPTY_${PN}-test-server-dbg="1" -DESCRIPTION_${PN}-test-server-dbg="" -RDEPENDS_${PN}-test-server-dbg="" -FILES_${PN}-test-server-dbg="${libdir}/erlang/lib/test_server-*/bin/.debug ${libdir}/erlang/lib/test_server-*/lib/.debug ${libdir}/erlang/lib/test_server-*/priv/lib/.debug ${libdir}/erlang/lib/test_server-*/priv/obj/.debug ${libdir}/erlang/lib/test_server-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-test-server="1" -DESCRIPTION_${PN}-test-server="" -RDEPENDS_${PN}-test-server="" -FILES_${PN}-test-server="${libdir}/erlang/lib/test_server-* " - -ALLOW_EMPTY_${PN}-syntax-tools-staticdev="1" -DESCRIPTION_${PN}-syntax-tools-staticdev="" -RDEPENDS_${PN}-syntax-tools-staticdev="" -FILES_${PN}-syntax-tools-staticdev="${libdir}/erlang/lib/syntax_tools-*/lib/*.a ${libdir}/erlang/lib/syntax_tools-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-syntax-tools-dev="1" -DESCRIPTION_${PN}-syntax-tools-dev="" -RDEPENDS_${PN}-syntax-tools-dev="" -FILES_${PN}-syntax-tools-dev="${libdir}/erlang/lib/syntax_tools-*/src ${libdir}/erlang/lib/syntax_tools-*/include " - -ALLOW_EMPTY_${PN}-syntax-tools-dbg="1" -DESCRIPTION_${PN}-syntax-tools-dbg="" -RDEPENDS_${PN}-syntax-tools-dbg="" -FILES_${PN}-syntax-tools-dbg="${libdir}/erlang/lib/syntax_tools-*/bin/.debug ${libdir}/erlang/lib/syntax_tools-*/lib/.debug ${libdir}/erlang/lib/syntax_tools-*/priv/lib/.debug ${libdir}/erlang/lib/syntax_tools-*/priv/obj/.debug ${libdir}/erlang/lib/syntax_tools-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-syntax-tools="1" -DESCRIPTION_${PN}-syntax-tools="" -RDEPENDS_${PN}-syntax-tools="" -FILES_${PN}-syntax-tools="${libdir}/erlang/lib/syntax_tools-* " - -ALLOW_EMPTY_${PN}-stdlib-staticdev="1" -DESCRIPTION_${PN}-stdlib-staticdev="" -RDEPENDS_${PN}-stdlib-staticdev="" -FILES_${PN}-stdlib-staticdev="${libdir}/erlang/lib/stdlib-*/lib/*.a ${libdir}/erlang/lib/stdlib-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-stdlib-doc="1" -DESCRIPTION_${PN}-stdlib-doc="" -RDEPENDS_${PN}-stdlib-doc="" -FILES_${PN}-stdlib-doc="${libdir}/erlang/lib/sasl-*/examples " - -ALLOW_EMPTY_${PN}-stdlib-dev="1" -DESCRIPTION_${PN}-stdlib-dev="" -RDEPENDS_${PN}-stdlib-dev="" -FILES_${PN}-stdlib-dev="${libdir}/erlang/lib/stdlib-*/src ${libdir}/erlang/lib/stdlib-*/include " - -ALLOW_EMPTY_${PN}-stdlib-dbg="1" -DESCRIPTION_${PN}-stdlib-dbg="" -RDEPENDS_${PN}-stdlib-dbg="" -FILES_${PN}-stdlib-dbg="${libdir}/erlang/lib/stdlib-*/bin/.debug ${libdir}/erlang/lib/stdlib-*/lib/.debug ${libdir}/erlang/lib/stdlib-*/priv/lib/.debug ${libdir}/erlang/lib/stdlib-*/priv/obj/.debug ${libdir}/erlang/lib/stdlib-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-stdlib="1" -DESCRIPTION_${PN}-stdlib="" -RDEPENDS_${PN}-stdlib="" -FILES_${PN}-stdlib="${libdir}/erlang/lib/stdlib-* " - -ALLOW_EMPTY_${PN}-staticdev="1" -DESCRIPTION_${PN}-staticdev="" -RDEPENDS_${PN}-staticdev="" -FILES_${PN}-staticdev+="${libdir}/erlang/usr/lib/*.a ${libdir}/erlang/usr/lib/internal/*.a ${libdir}/erlang/erts-*/lib/*.a ${libdir}/erlang/erts-*/lib/internal/* " - -ALLOW_EMPTY_${PN}-ssl-staticdev="1" -DESCRIPTION_${PN}-ssl-staticdev="" -RDEPENDS_${PN}-ssl-staticdev="" -FILES_${PN}-ssl-staticdev="${libdir}/erlang/lib/ssl-*/lib/*.a ${libdir}/erlang/lib/ssl-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-ssl-dev="1" -DESCRIPTION_${PN}-ssl-dev="" -RDEPENDS_${PN}-ssl-dev="" -FILES_${PN}-ssl-dev="${libdir}/erlang/lib/ssl-*/src ${libdir}/erlang/lib/ssl-*/include " - -ALLOW_EMPTY_${PN}-ssl-dbg="1" -DESCRIPTION_${PN}-ssl-dbg="" -RDEPENDS_${PN}-ssl-dbg="" -FILES_${PN}-ssl-dbg="${libdir}/erlang/lib/ssl-*/bin/.debug ${libdir}/erlang/lib/ssl-*/lib/.debug ${libdir}/erlang/lib/ssl-*/priv/lib/.debug ${libdir}/erlang/lib/ssl-*/priv/obj/.debug ${libdir}/erlang/lib/ssl-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-ssl="1" -DESCRIPTION_${PN}-ssl="" -RDEPENDS_${PN}-ssl="" -FILES_${PN}-ssl="${libdir}/erlang/lib/ssl-* " - -ALLOW_EMPTY_${PN}-ssh-staticdev="1" -DESCRIPTION_${PN}-ssh-staticdev="" -RDEPENDS_${PN}-ssh-staticdev="" -FILES_${PN}-ssh-staticdev="${libdir}/erlang/lib/ssh-*/lib/*.a ${libdir}/erlang/lib/ssh-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-ssh-dev="1" -DESCRIPTION_${PN}-ssh-dev="" -RDEPENDS_${PN}-ssh-dev="" -FILES_${PN}-ssh-dev="${libdir}/erlang/lib/ssh-*/src ${libdir}/erlang/lib/ssh-*/include " - -ALLOW_EMPTY_${PN}-ssh-dbg="1" -DESCRIPTION_${PN}-ssh-dbg="" -RDEPENDS_${PN}-ssh-dbg="" -FILES_${PN}-ssh-dbg="${libdir}/erlang/lib/ssh-*/bin/.debug ${libdir}/erlang/lib/ssh-*/lib/.debug ${libdir}/erlang/lib/ssh-*/priv/lib/.debug ${libdir}/erlang/lib/ssh-*/priv/obj/.debug ${libdir}/erlang/lib/ssh-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-ssh="1" -DESCRIPTION_${PN}-ssh="" -RDEPENDS_${PN}-ssh="" -FILES_${PN}-ssh="${libdir}/erlang/lib/ssh-* " - -ALLOW_EMPTY_${PN}-snmp-staticdev="1" -DESCRIPTION_${PN}-snmp-staticdev="" -RDEPENDS_${PN}-snmp-staticdev="" -FILES_${PN}-snmp-staticdev="${libdir}/erlang/lib/snmp-*/lib/*.a ${libdir}/erlang/lib/snmp-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-snmp-dev="1" -DESCRIPTION_${PN}-snmp-dev="" -RDEPENDS_${PN}-snmp-dev="" -FILES_${PN}-snmp-dev="${libdir}/erlang/lib/snmp-*/src ${libdir}/erlang/lib/snmp-*/include " - -ALLOW_EMPTY_${PN}-snmp-dbg="1" -DESCRIPTION_${PN}-snmp-dbg="" -RDEPENDS_${PN}-snmp-dbg="" -FILES_${PN}-snmp-dbg="${libdir}/erlang/lib/snmp-*/bin/.debug ${libdir}/erlang/lib/snmp-*/lib/.debug ${libdir}/erlang/lib/snmp-*/priv/lib/.debug ${libdir}/erlang/lib/snmp-*/priv/obj/.debug ${libdir}/erlang/lib/snmp-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-snmp="1" -DESCRIPTION_${PN}-snmp="" -RDEPENDS_${PN}-snmp="" -FILES_${PN}-snmp="${libdir}/erlang/lib/snmp-* " - -ALLOW_EMPTY_${PN}-sasl-staticdev="1" -DESCRIPTION_${PN}-sasl-staticdev="" -RDEPENDS_${PN}-sasl-staticdev="" -FILES_${PN}-sasl-staticdev="${libdir}/erlang/lib/sasl-*/lib/*.a ${libdir}/erlang/lib/sasl-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-sasl-doc="1" -DESCRIPTION_${PN}-sasl-doc="" -RDEPENDS_${PN}-sasl-doc="" -FILES_${PN}-sasl-doc="${libdir}/erlang/lib/sasl-*/examples " - -ALLOW_EMPTY_${PN}-sasl-dev="1" -DESCRIPTION_${PN}-sasl-dev="" -RDEPENDS_${PN}-sasl-dev="" -FILES_${PN}-sasl-dev="${libdir}/erlang/lib/sasl-*/src ${libdir}/erlang/lib/sasl-*/include " - -ALLOW_EMPTY_${PN}-sasl-dbg="1" -DESCRIPTION_${PN}-sasl-dbg="" -RDEPENDS_${PN}-sasl-dbg="" -FILES_${PN}-sasl-dbg="${libdir}/erlang/lib/sasl-*/bin/.debug ${libdir}/erlang/lib/sasl-*/lib/.debug ${libdir}/erlang/lib/sasl-*/priv/lib/.debug ${libdir}/erlang/lib/sasl-*/priv/obj/.debug ${libdir}/erlang/lib/sasl-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-sasl="1" -DESCRIPTION_${PN}-sasl="" -RDEPENDS_${PN}-sasl="" -FILES_${PN}-sasl="${libdir}/erlang/lib/sasl-* " - -ALLOW_EMPTY_${PN}-runtime-tools-staticdev="1" -DESCRIPTION_${PN}-runtime-tools-staticdev="" -RDEPENDS_${PN}-runtime-tools-staticdev="" -FILES_${PN}-runtime-tools-staticdev="${libdir}/erlang/lib/runtime_tools-*/lib/*.a ${libdir}/erlang/lib/runtime_tools-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-runtime-tools-dev="1" -DESCRIPTION_${PN}-runtime-tools-dev="" -RDEPENDS_${PN}-runtime-tools-dev="" -FILES_${PN}-runtime-tools-dev="${libdir}/erlang/lib/runtime_tools-*/src ${libdir}/erlang/lib/runtime_tools-*/include " - -ALLOW_EMPTY_${PN}-runtime-tools-dbg="1" -DESCRIPTION_${PN}-runtime-tools-dbg="" -RDEPENDS_${PN}-runtime-tools-dbg="" -FILES_${PN}-runtime-tools-dbg="${libdir}/erlang/lib/runtime_tools-*/bin/.debug ${libdir}/erlang/lib/runtime_tools-*/lib/.debug ${libdir}/erlang/lib/runtime_tools-*/priv/lib/.debug ${libdir}/erlang/lib/runtime_tools-*/priv/obj/.debug ${libdir}/erlang/lib/runtime_tools-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-runtime-tools="1" -DESCRIPTION_${PN}-runtime-tools="" -RDEPENDS_${PN}-runtime-tools="" -FILES_${PN}-runtime-tools="${libdir}/erlang/lib/runtime_tools-* " - -ALLOW_EMPTY_${PN}-reltool-staticdev="1" -DESCRIPTION_${PN}-reltool-staticdev="" -RDEPENDS_${PN}-reltool-staticdev="" -FILES_${PN}-reltool-staticdev="${libdir}/erlang/lib/reltool-*/lib/*.a ${libdir}/erlang/lib/reltool-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-reltool-dev="1" -DESCRIPTION_${PN}-reltool-dev="" -RDEPENDS_${PN}-reltool-dev="" -FILES_${PN}-reltool-dev="${libdir}/erlang/lib/reltool-*/src ${libdir}/erlang/lib/reltool-*/include " - -ALLOW_EMPTY_${PN}-reltool-dbg="1" -DESCRIPTION_${PN}-reltool-dbg="" -RDEPENDS_${PN}-reltool-dbg="" -FILES_${PN}-reltool-dbg="${libdir}/erlang/lib/reltool-*/bin/.debug ${libdir}/erlang/lib/reltool-*/lib/.debug ${libdir}/erlang/lib/reltool-*/priv/lib/.debug ${libdir}/erlang/lib/reltool-*/priv/obj/.debug ${libdir}/erlang/lib/reltool-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-reltool="1" -DESCRIPTION_${PN}-reltool="" -RDEPENDS_${PN}-reltool="" -FILES_${PN}-reltool="${libdir}/erlang/lib/reltool-* " - -ALLOW_EMPTY_${PN}-public-key-staticdev="1" -DESCRIPTION_${PN}-public-key-staticdev="" -RDEPENDS_${PN}-public-key-staticdev="" -FILES_${PN}-public-key-staticdev="${libdir}/erlang/lib/public_key-*/lib/*.a ${libdir}/erlang/lib/public_key-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-public-key-dev="1" -DESCRIPTION_${PN}-public-key-dev="" -RDEPENDS_${PN}-public-key-dev="" -FILES_${PN}-public-key-dev="${libdir}/erlang/lib/public_key-*/src ${libdir}/erlang/lib/public_key-*/include " - -ALLOW_EMPTY_${PN}-public-key-dbg="1" -DESCRIPTION_${PN}-public-key-dbg="" -RDEPENDS_${PN}-public-key-dbg="" -FILES_${PN}-public-key-dbg="${libdir}/erlang/lib/public_key-*/bin/.debug ${libdir}/erlang/lib/public_key-*/lib/.debug ${libdir}/erlang/lib/public_key-*/priv/lib/.debug ${libdir}/erlang/lib/public_key-*/priv/obj/.debug ${libdir}/erlang/lib/public_key-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-public-key="1" -DESCRIPTION_${PN}-public-key="" -RDEPENDS_${PN}-public-key="" -FILES_${PN}-public-key="${libdir}/erlang/lib/public_key-* " - -ALLOW_EMPTY_${PN}-pman-staticdev="1" -DESCRIPTION_${PN}-pman-staticdev="" -RDEPENDS_${PN}-pman-staticdev="" -FILES_${PN}-pman-staticdev="${libdir}/erlang/lib/pman-*/lib/*.a ${libdir}/erlang/lib/pman-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-pman-dev="1" -DESCRIPTION_${PN}-pman-dev="" -RDEPENDS_${PN}-pman-dev="" -FILES_${PN}-pman-dev="${libdir}/erlang/lib/pman-*/src ${libdir}/erlang/lib/pman-*/include " - -ALLOW_EMPTY_${PN}-pman-dbg="1" -DESCRIPTION_${PN}-pman-dbg="" -RDEPENDS_${PN}-pman-dbg="" -FILES_${PN}-pman-dbg="${libdir}/erlang/lib/pman-*/bin/.debug ${libdir}/erlang/lib/pman-*/lib/.debug ${libdir}/erlang/lib/pman-*/priv/lib/.debug ${libdir}/erlang/lib/pman-*/priv/obj/.debug ${libdir}/erlang/lib/pman-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-pman="1" -DESCRIPTION_${PN}-pman="" -RDEPENDS_${PN}-pman="" -FILES_${PN}-pman="${libdir}/erlang/lib/pman-* " - -ALLOW_EMPTY_${PN}-percept-staticdev="1" -DESCRIPTION_${PN}-percept-staticdev="" -RDEPENDS_${PN}-percept-staticdev="" -FILES_${PN}-percept-staticdev="${libdir}/erlang/lib/percept-*/lib/*.a ${libdir}/erlang/lib/percept-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-percept-dev="1" -DESCRIPTION_${PN}-percept-dev="" -RDEPENDS_${PN}-percept-dev="" -FILES_${PN}-percept-dev="${libdir}/erlang/lib/percept-*/src ${libdir}/erlang/lib/percept-*/include " - -ALLOW_EMPTY_${PN}-percept-dbg="1" -DESCRIPTION_${PN}-percept-dbg="" -RDEPENDS_${PN}-percept-dbg="" -FILES_${PN}-percept-dbg="${libdir}/erlang/lib/percept-*/bin/.debug ${libdir}/erlang/lib/percept-*/lib/.debug ${libdir}/erlang/lib/percept-*/priv/lib/.debug ${libdir}/erlang/lib/percept-*/priv/obj/.debug ${libdir}/erlang/lib/percept-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-percept="1" -DESCRIPTION_${PN}-percept="" -RDEPENDS_${PN}-percept="" -FILES_${PN}-percept="${libdir}/erlang/lib/percept-* " - -ALLOW_EMPTY_${PN}-parsetools-staticdev="1" -DESCRIPTION_${PN}-parsetools-staticdev="" -RDEPENDS_${PN}-parsetools-staticdev="" -FILES_${PN}-parsetools-staticdev="${libdir}/erlang/lib/parsetools-*/lib/*.a ${libdir}/erlang/lib/parsetools-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-parsetools-dev="1" -DESCRIPTION_${PN}-parsetools-dev="" -RDEPENDS_${PN}-parsetools-dev="" -FILES_${PN}-parsetools-dev="${libdir}/erlang/lib/parsetools-*/src ${libdir}/erlang/lib/parsetools-*/include " - -ALLOW_EMPTY_${PN}-parsetools-dbg="1" -DESCRIPTION_${PN}-parsetools-dbg="" -RDEPENDS_${PN}-parsetools-dbg="" -FILES_${PN}-parsetools-dbg="${libdir}/erlang/lib/parsetools-*/bin/.debug ${libdir}/erlang/lib/parsetools-*/lib/.debug ${libdir}/erlang/lib/parsetools-*/priv/lib/.debug ${libdir}/erlang/lib/parsetools-*/priv/obj/.debug ${libdir}/erlang/lib/parsetools-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-parsetools="1" -DESCRIPTION_${PN}-parsetools="" -RDEPENDS_${PN}-parsetools="" -FILES_${PN}-parsetools="${libdir}/erlang/lib/parsetools-* " - -ALLOW_EMPTY_${PN}-otp-mibs-staticdev="1" -DESCRIPTION_${PN}-otp-mibs-staticdev="" -RDEPENDS_${PN}-otp-mibs-staticdev="" -FILES_${PN}-otp-mibs-staticdev="${libdir}/erlang/lib/otp_mibs-*/lib/*.a ${libdir}/erlang/lib/otp_mibs-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-otp-mibs-dev="1" -DESCRIPTION_${PN}-otp-mibs-dev="" -RDEPENDS_${PN}-otp-mibs-dev="" -FILES_${PN}-otp-mibs-dev="${libdir}/erlang/lib/otp_mibs-*/src ${libdir}/erlang/lib/otp_mibs-*/include " - -ALLOW_EMPTY_${PN}-otp-mibs-dbg="1" -DESCRIPTION_${PN}-otp-mibs-dbg="" -RDEPENDS_${PN}-otp-mibs-dbg="" -FILES_${PN}-otp-mibs-dbg="${libdir}/erlang/lib/otp_mibs-*/bin/.debug ${libdir}/erlang/lib/otp_mibs-*/lib/.debug ${libdir}/erlang/lib/otp_mibs-*/priv/lib/.debug ${libdir}/erlang/lib/otp_mibs-*/priv/obj/.debug ${libdir}/erlang/lib/otp_mibs-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-otp-mibs="1" -DESCRIPTION_${PN}-otp-mibs="" -RDEPENDS_${PN}-otp-mibs="" -FILES_${PN}-otp-mibs="${libdir}/erlang/lib/otp_mibs-* " - -ALLOW_EMPTY_${PN}-os-mon-staticdev="1" -DESCRIPTION_${PN}-os-mon-staticdev="" -RDEPENDS_${PN}-os-mon-staticdev="" -FILES_${PN}-os-mon-staticdev="${libdir}/erlang/lib/os_mon-*/lib/*.a ${libdir}/erlang/lib/os_mon-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-os-mon-dev="1" -DESCRIPTION_${PN}-os-mon-dev="" -RDEPENDS_${PN}-os-mon-dev="" -FILES_${PN}-os-mon-dev="${libdir}/erlang/lib/os_mon-*/src ${libdir}/erlang/lib/os_mon-*/include " - -ALLOW_EMPTY_${PN}-os-mon-dbg="1" -DESCRIPTION_${PN}-os-mon-dbg="" -RDEPENDS_${PN}-os-mon-dbg="" -FILES_${PN}-os-mon-dbg="${libdir}/erlang/lib/os_mon-*/bin/.debug ${libdir}/erlang/lib/os_mon-*/lib/.debug ${libdir}/erlang/lib/os_mon-*/priv/lib/.debug ${libdir}/erlang/lib/os_mon-*/priv/obj/.debug ${libdir}/erlang/lib/os_mon-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-os-mon="1" -DESCRIPTION_${PN}-os-mon="" -RDEPENDS_${PN}-os-mon="" -FILES_${PN}-os-mon="${libdir}/erlang/lib/os_mon-* " - -ALLOW_EMPTY_${PN}-orber-staticdev="1" -DESCRIPTION_${PN}-orber-staticdev="" -RDEPENDS_${PN}-orber-staticdev="" -FILES_${PN}-orber-staticdev="${libdir}/erlang/lib/orber-*/lib/*.a ${libdir}/erlang/lib/orber-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-orber-dev="1" -DESCRIPTION_${PN}-orber-dev="" -RDEPENDS_${PN}-orber-dev="" -FILES_${PN}-orber-dev="${libdir}/erlang/lib/orber-*/src ${libdir}/erlang/lib/orber-*/include " - -ALLOW_EMPTY_${PN}-orber-dbg="1" -DESCRIPTION_${PN}-orber-dbg="" -RDEPENDS_${PN}-orber-dbg="" -FILES_${PN}-orber-dbg="${libdir}/erlang/lib/orber-*/bin/.debug ${libdir}/erlang/lib/orber-*/lib/.debug ${libdir}/erlang/lib/orber-*/priv/lib/.debug ${libdir}/erlang/lib/orber-*/priv/obj/.debug ${libdir}/erlang/lib/orber-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-orber="1" -DESCRIPTION_${PN}-orber="" -RDEPENDS_${PN}-orber="" -FILES_${PN}-orber="${libdir}/erlang/lib/orber-* " - -ALLOW_EMPTY_${PN}-observer-staticdev="1" -DESCRIPTION_${PN}-observer-staticdev="" -RDEPENDS_${PN}-observer-staticdev="" -FILES_${PN}-observer-staticdev="${libdir}/erlang/lib/observer-*/lib/*.a ${libdir}/erlang/lib/observer-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-observer-dev="1" -DESCRIPTION_${PN}-observer-dev="" -RDEPENDS_${PN}-observer-dev="" -FILES_${PN}-observer-dev="${libdir}/erlang/lib/observer-*/src ${libdir}/erlang/lib/observer-*/include " - -ALLOW_EMPTY_${PN}-observer-dbg="1" -DESCRIPTION_${PN}-observer-dbg="" -RDEPENDS_${PN}-observer-dbg="" -FILES_${PN}-observer-dbg="${libdir}/erlang/lib/observer-*/bin/.debug ${libdir}/erlang/lib/observer-*/lib/.debug ${libdir}/erlang/lib/observer-*/priv/lib/.debug ${libdir}/erlang/lib/observer-*/priv/obj/.debug ${libdir}/erlang/lib/observer-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-observer="1" -DESCRIPTION_${PN}-observer="" -RDEPENDS_${PN}-observer="" -FILES_${PN}-observer="${libdir}/erlang/lib/observer-* " - -ALLOW_EMPTY_${PN}-mnesia-staticdev="1" -DESCRIPTION_${PN}-mnesia-staticdev="" -RDEPENDS_${PN}-mnesia-staticdev="" -FILES_${PN}-mnesia-staticdev="${libdir}/erlang/lib/mnesia-*/lib/*.a ${libdir}/erlang/lib/mnesia-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-mnesia-dev="1" -DESCRIPTION_${PN}-mnesia-dev="" -RDEPENDS_${PN}-mnesia-dev="" -FILES_${PN}-mnesia-dev="${libdir}/erlang/lib/mnesia-*/src ${libdir}/erlang/lib/mnesia-*/include " - -ALLOW_EMPTY_${PN}-mnesia-dbg="1" -DESCRIPTION_${PN}-mnesia-dbg="" -RDEPENDS_${PN}-mnesia-dbg="" -FILES_${PN}-mnesia-dbg="${libdir}/erlang/lib/mnesia-*/bin/.debug ${libdir}/erlang/lib/mnesia-*/lib/.debug ${libdir}/erlang/lib/mnesia-*/priv/lib/.debug ${libdir}/erlang/lib/mnesia-*/priv/obj/.debug ${libdir}/erlang/lib/mnesia-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-mnesia="1" -DESCRIPTION_${PN}-mnesia="" -RDEPENDS_${PN}-mnesia="" -FILES_${PN}-mnesia="${libdir}/erlang/lib/mnesia-* " - -ALLOW_EMPTY_${PN}-megaco-staticdev="1" -DESCRIPTION_${PN}-megaco-staticdev="" -RDEPENDS_${PN}-megaco-staticdev="" -FILES_${PN}-megaco-staticdev="${libdir}/erlang/lib/megaco-*/lib/*.a ${libdir}/erlang/lib/megaco-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-megaco-dev="1" -DESCRIPTION_${PN}-megaco-dev="" -RDEPENDS_${PN}-megaco-dev="" -FILES_${PN}-megaco-dev="${libdir}/erlang/lib/megaco-*/src ${libdir}/erlang/lib/megaco-*/include " - -ALLOW_EMPTY_${PN}-megaco-dbg="1" -DESCRIPTION_${PN}-megaco-dbg="" -RDEPENDS_${PN}-megaco-dbg="" -FILES_${PN}-megaco-dbg="${libdir}/erlang/lib/megaco-*/bin/.debug ${libdir}/erlang/lib/megaco-*/lib/.debug ${libdir}/erlang/lib/megaco-*/priv/lib/.debug ${libdir}/erlang/lib/megaco-*/priv/obj/.debug ${libdir}/erlang/lib/megaco-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-megaco="1" -DESCRIPTION_${PN}-megaco="" -RDEPENDS_${PN}-megaco="" -FILES_${PN}-megaco="${libdir}/erlang/lib/megaco-* " - -ALLOW_EMPTY_${PN}-kernel-staticdev="1" -DESCRIPTION_${PN}-kernel-staticdev="" -RDEPENDS_${PN}-kernel-staticdev="" -FILES_${PN}-kernel-staticdev="${libdir}/erlang/lib/kernel-*/lib/*.a ${libdir}/erlang/lib/kernel-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-kernel-doc="1" -DESCRIPTION_${PN}-kernel-doc="" -RDEPENDS_${PN}-kernel-doc="" -FILES_${PN}-kernel-doc="${libdir}/erlang/lib/kernel-*/examples " - -ALLOW_EMPTY_${PN}-kernel-dev="1" -DESCRIPTION_${PN}-kernel-dev="" -RDEPENDS_${PN}-kernel-dev="" -FILES_${PN}-kernel-dev="${libdir}/erlang/lib/kernel-*/src ${libdir}/erlang/lib/kernel-*/include " - -ALLOW_EMPTY_${PN}-kernel-dbg="1" -DESCRIPTION_${PN}-kernel-dbg="" -RDEPENDS_${PN}-kernel-dbg="" -FILES_${PN}-kernel-dbg="${libdir}/erlang/lib/kernel-*/bin/.debug ${libdir}/erlang/lib/kernel-*/lib/.debug ${libdir}/erlang/lib/kernel-*/priv/lib/.debug ${libdir}/erlang/lib/kernel-*/priv/obj/.debug ${libdir}/erlang/lib/kernel-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-kernel="1" -DESCRIPTION_${PN}-kernel="" -RDEPENDS_${PN}-kernel="" -FILES_${PN}-kernel="${libdir}/erlang/lib/kernel-* " - -ALLOW_EMPTY_${PN}-jinterface-staticdev="1" -DESCRIPTION_${PN}-jinterface-staticdev="" -RDEPENDS_${PN}-jinterface-staticdev="" -FILES_${PN}-jinterface-staticdev="${libdir}/erlang/lib/jinterface-*/lib/*.a ${libdir}/erlang/lib/jinterface-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-jinterface-dev="1" -DESCRIPTION_${PN}-jinterface-dev="" -RDEPENDS_${PN}-jinterface-dev="" -FILES_${PN}-jinterface-dev="${libdir}/erlang/lib/jinterface-*/src ${libdir}/erlang/lib/jinterface-*/include " - -ALLOW_EMPTY_${PN}-jinterface-dbg="1" -DESCRIPTION_${PN}-jinterface-dbg="" -RDEPENDS_${PN}-jinterface-dbg="" -FILES_${PN}-jinterface-dbg="${libdir}/erlang/lib/jinterface-*/bin/.debug ${libdir}/erlang/lib/jinterface-*/lib/.debug ${libdir}/erlang/lib/jinterface-*/priv/lib/.debug ${libdir}/erlang/lib/jinterface-*/priv/obj/.debug ${libdir}/erlang/lib/jinterface-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-jinterface="1" -DESCRIPTION_${PN}-jinterface="" -RDEPENDS_${PN}-jinterface="" -FILES_${PN}-jinterface="${libdir}/erlang/lib/jinterface-* " - -ALLOW_EMPTY_${PN}-inets-staticdev="1" -DESCRIPTION_${PN}-inets-staticdev="" -RDEPENDS_${PN}-inets-staticdev="" -FILES_${PN}-inets-staticdev="${libdir}/erlang/lib/inets-*/lib/*.a ${libdir}/erlang/lib/inets-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-inets-dev="1" -DESCRIPTION_${PN}-inets-dev="" -RDEPENDS_${PN}-inets-dev="" -FILES_${PN}-inets-dev="${libdir}/erlang/lib/inets-*/src ${libdir}/erlang/lib/inets-*/include " - -ALLOW_EMPTY_${PN}-inets-dbg="1" -DESCRIPTION_${PN}-inets-dbg="" -RDEPENDS_${PN}-inets-dbg="" -FILES_${PN}-inets-dbg="${libdir}/erlang/lib/inets-*/bin/.debug ${libdir}/erlang/lib/inets-*/lib/.debug ${libdir}/erlang/lib/inets-*/priv/lib/.debug ${libdir}/erlang/lib/inets-*/priv/obj/.debug ${libdir}/erlang/lib/inets-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-inets="1" -DESCRIPTION_${PN}-inets="" -RDEPENDS_${PN}-inets="" -FILES_${PN}-inets="${libdir}/erlang/lib/inets-* " - -ALLOW_EMPTY_${PN}-ic-staticdev="1" -DESCRIPTION_${PN}-ic-staticdev="" -RDEPENDS_${PN}-ic-staticdev="" -FILES_${PN}-ic-staticdev="${libdir}/erlang/lib/ic-*/lib/*.a ${libdir}/erlang/lib/ic-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-ic-dev="1" -DESCRIPTION_${PN}-ic-dev="" -RDEPENDS_${PN}-ic-dev="" -FILES_${PN}-ic-dev="${libdir}/erlang/lib/ic-*/src ${libdir}/erlang/lib/ic-*/include " - -ALLOW_EMPTY_${PN}-ic-dbg="1" -DESCRIPTION_${PN}-ic-dbg="" -RDEPENDS_${PN}-ic-dbg="" -FILES_${PN}-ic-dbg="${libdir}/erlang/lib/ic-*/bin/.debug ${libdir}/erlang/lib/ic-*/lib/.debug ${libdir}/erlang/lib/ic-*/priv/lib/.debug ${libdir}/erlang/lib/ic-*/priv/obj/.debug ${libdir}/erlang/lib/ic-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-ic="1" -DESCRIPTION_${PN}-ic="" -RDEPENDS_${PN}-ic="" -FILES_${PN}-ic="${libdir}/erlang/lib/ic-* " - -ALLOW_EMPTY_${PN}-hipe-staticdev="1" -DESCRIPTION_${PN}-hipe-staticdev="" -RDEPENDS_${PN}-hipe-staticdev="" -FILES_${PN}-hipe-staticdev="${libdir}/erlang/lib/hipe-*/lib/*.a ${libdir}/erlang/lib/hipe-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-hipe-dev="1" -DESCRIPTION_${PN}-hipe-dev="" -RDEPENDS_${PN}-hipe-dev="" -FILES_${PN}-hipe-dev="${libdir}/erlang/lib/hipe-*/src ${libdir}/erlang/lib/hipe-*/include " - -ALLOW_EMPTY_${PN}-hipe-dbg="1" -DESCRIPTION_${PN}-hipe-dbg="" -RDEPENDS_${PN}-hipe-dbg="" -FILES_${PN}-hipe-dbg="${libdir}/erlang/lib/hipe-*/bin/.debug ${libdir}/erlang/lib/hipe-*/lib/.debug ${libdir}/erlang/lib/hipe-*/priv/lib/.debug ${libdir}/erlang/lib/hipe-*/priv/obj/.debug ${libdir}/erlang/lib/hipe-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-hipe="1" -DESCRIPTION_${PN}-hipe="" -RDEPENDS_${PN}-hipe="" -FILES_${PN}-hipe="${libdir}/erlang/lib/hipe-* " - -ALLOW_EMPTY_${PN}-gs-staticdev="1" -DESCRIPTION_${PN}-gs-staticdev="" -RDEPENDS_${PN}-gs-staticdev="" -FILES_${PN}-gs-staticdev="${libdir}/erlang/lib/gs-*/lib/*.a ${libdir}/erlang/lib/gs-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-gs-dev="1" -DESCRIPTION_${PN}-gs-dev="" -RDEPENDS_${PN}-gs-dev="" -FILES_${PN}-gs-dev="${libdir}/erlang/lib/gs-*/src ${libdir}/erlang/lib/gs-*/include " - -ALLOW_EMPTY_${PN}-gs-dbg="1" -DESCRIPTION_${PN}-gs-dbg="" -RDEPENDS_${PN}-gs-dbg="" -FILES_${PN}-gs-dbg="${libdir}/erlang/lib/gs-*/bin/.debug ${libdir}/erlang/lib/gs-*/lib/.debug ${libdir}/erlang/lib/gs-*/priv/lib/.debug ${libdir}/erlang/lib/gs-*/priv/obj/.debug ${libdir}/erlang/lib/gs-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-gs="1" -DESCRIPTION_${PN}-gs="" -RDEPENDS_${PN}-gs="" -FILES_${PN}-gs="${libdir}/erlang/lib/gs-* " - -ALLOW_EMPTY_${PN}-eunit-staticdev="1" -DESCRIPTION_${PN}-eunit-staticdev="" -RDEPENDS_${PN}-eunit-staticdev="" -FILES_${PN}-eunit-staticdev="${libdir}/erlang/lib/eunit-*/lib/*.a ${libdir}/erlang/lib/eunit-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-eunit-dev="1" -DESCRIPTION_${PN}-eunit-dev="" -RDEPENDS_${PN}-eunit-dev="" -FILES_${PN}-eunit-dev="${libdir}/erlang/lib/eunit-*/src ${libdir}/erlang/lib/eunit-*/include " - -ALLOW_EMPTY_${PN}-eunit-dbg="1" -DESCRIPTION_${PN}-eunit-dbg="" -RDEPENDS_${PN}-eunit-dbg="" -FILES_${PN}-eunit-dbg="${libdir}/erlang/lib/eunit-*/bin/.debug ${libdir}/erlang/lib/eunit-*/lib/.debug ${libdir}/erlang/lib/eunit-*/priv/lib/.debug ${libdir}/erlang/lib/eunit-*/priv/obj/.debug ${libdir}/erlang/lib/eunit-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-eunit="1" -DESCRIPTION_${PN}-eunit="" -RDEPENDS_${PN}-eunit="" -FILES_${PN}-eunit="${libdir}/erlang/lib/eunit-* " - -ALLOW_EMPTY_${PN}-et-staticdev="1" -DESCRIPTION_${PN}-et-staticdev="" -RDEPENDS_${PN}-et-staticdev="" -FILES_${PN}-et-staticdev="${libdir}/erlang/lib/et-*/lib/*.a ${libdir}/erlang/lib/et-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-et-dev="1" -DESCRIPTION_${PN}-et-dev="" -RDEPENDS_${PN}-et-dev="" -FILES_${PN}-et-dev="${libdir}/erlang/lib/et-*/src ${libdir}/erlang/lib/et-*/include " - -ALLOW_EMPTY_${PN}-et-dbg="1" -DESCRIPTION_${PN}-et-dbg="" -RDEPENDS_${PN}-et-dbg="" -FILES_${PN}-et-dbg="${libdir}/erlang/lib/et-*/bin/.debug ${libdir}/erlang/lib/et-*/lib/.debug ${libdir}/erlang/lib/et-*/priv/lib/.debug ${libdir}/erlang/lib/et-*/priv/obj/.debug ${libdir}/erlang/lib/et-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-et="1" -DESCRIPTION_${PN}-et="" -RDEPENDS_${PN}-et="" -FILES_${PN}-et="${libdir}/erlang/lib/et-* " - -ALLOW_EMPTY_${PN}-erts-staticdev="1" -DESCRIPTION_${PN}-erts-staticdev="" -RDEPENDS_${PN}-erts-staticdev="" -FILES_${PN}-erts-staticdev="${libdir}/erlang/lib/erts-*/lib/*.a ${libdir}/erlang/lib/erts-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-erts-dev="1" -DESCRIPTION_${PN}-erts-dev="" -RDEPENDS_${PN}-erts-dev="" -FILES_${PN}-erts-dev="${libdir}/erlang/lib/erts-*/src ${libdir}/erlang/lib/erts-*/include " - -ALLOW_EMPTY_${PN}-erts-dbg="1" -DESCRIPTION_${PN}-erts-dbg="" -RDEPENDS_${PN}-erts-dbg="" -FILES_${PN}-erts-dbg="${libdir}/erlang/lib/erts-*/bin/.debug ${libdir}/erlang/lib/erts-*/lib/.debug ${libdir}/erlang/lib/erts-*/priv/lib/.debug ${libdir}/erlang/lib/erts-*/priv/obj/.debug ${libdir}/erlang/lib/erts-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-erts="1" -DESCRIPTION_${PN}-erts="" -RDEPENDS_${PN}-erts="" -FILES_${PN}-erts="${libdir}/erlang/lib/erts-* " - -ALLOW_EMPTY_${PN}-erl-interface-staticdev="1" -DESCRIPTION_${PN}-erl-interface-staticdev="" -RDEPENDS_${PN}-erl-interface-staticdev="" -FILES_${PN}-erl-interface-staticdev="${libdir}/erlang/lib/erl_interface-*/lib/*.a ${libdir}/erlang/lib/erl_interface-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-erl-interface-dev="1" -DESCRIPTION_${PN}-erl-interface-dev="" -RDEPENDS_${PN}-erl-interface-dev="" -FILES_${PN}-erl-interface-dev="${libdir}/erlang/lib/erl_interface-*/src ${libdir}/erlang/lib/erl_interface-*/include " - -ALLOW_EMPTY_${PN}-erl-interface-dbg="1" -DESCRIPTION_${PN}-erl-interface-dbg="" -RDEPENDS_${PN}-erl-interface-dbg="" -FILES_${PN}-erl-interface-dbg="${libdir}/erlang/lib/erl_interface-*/bin/.debug ${libdir}/erlang/lib/erl_interface-*/lib/.debug ${libdir}/erlang/lib/erl_interface-*/priv/lib/.debug ${libdir}/erlang/lib/erl_interface-*/priv/obj/.debug ${libdir}/erlang/lib/erl_interface-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-erl-interface="1" -DESCRIPTION_${PN}-erl-interface="" -RDEPENDS_${PN}-erl-interface="" -FILES_${PN}-erl-interface="${libdir}/erlang/lib/erl_interface-* " - -ALLOW_EMPTY_${PN}-erl-docgen-staticdev="1" -DESCRIPTION_${PN}-erl-docgen-staticdev="" -RDEPENDS_${PN}-erl-docgen-staticdev="" -FILES_${PN}-erl-docgen-staticdev="${libdir}/erlang/lib/erl_docgen-*/lib/*.a ${libdir}/erlang/lib/erl_docgen-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-erl-docgen-dev="1" -DESCRIPTION_${PN}-erl-docgen-dev="" -RDEPENDS_${PN}-erl-docgen-dev="" -FILES_${PN}-erl-docgen-dev="${libdir}/erlang/lib/erl_docgen-*/src ${libdir}/erlang/lib/erl_docgen-*/include " - -ALLOW_EMPTY_${PN}-erl-docgen-dbg="1" -DESCRIPTION_${PN}-erl-docgen-dbg="" -RDEPENDS_${PN}-erl-docgen-dbg="" -FILES_${PN}-erl-docgen-dbg="${libdir}/erlang/lib/erl_docgen-*/bin/.debug ${libdir}/erlang/lib/erl_docgen-*/lib/.debug ${libdir}/erlang/lib/erl_docgen-*/priv/lib/.debug ${libdir}/erlang/lib/erl_docgen-*/priv/obj/.debug ${libdir}/erlang/lib/erl_docgen-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-erl-docgen="1" -DESCRIPTION_${PN}-erl-docgen="" -RDEPENDS_${PN}-erl-docgen="" -FILES_${PN}-erl-docgen="${libdir}/erlang/lib/erl_docgen-* " - -ALLOW_EMPTY_${PN}-eldap-staticdev="1" -DESCRIPTION_${PN}-eldap-staticdev="" -RDEPENDS_${PN}-eldap-staticdev="" -FILES_${PN}-eldap-staticdev="${libdir}/erlang/lib/eldap-*/lib/*.a ${libdir}/erlang/lib/eldap-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-eldap-dev="1" -DESCRIPTION_${PN}-eldap-dev="" -RDEPENDS_${PN}-eldap-dev="" -FILES_${PN}-eldap-dev="${libdir}/erlang/lib/eldap-*/src ${libdir}/erlang/lib/eldap-*/include " - -ALLOW_EMPTY_${PN}-eldap-dbg="1" -DESCRIPTION_${PN}-eldap-dbg="" -RDEPENDS_${PN}-eldap-dbg="" -FILES_${PN}-eldap-dbg="${libdir}/erlang/lib/eldap-*/bin/.debug ${libdir}/erlang/lib/eldap-*/lib/.debug ${libdir}/erlang/lib/eldap-*/priv/lib/.debug ${libdir}/erlang/lib/eldap-*/priv/obj/.debug ${libdir}/erlang/lib/eldap-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-eldap="1" -DESCRIPTION_${PN}-eldap="" -RDEPENDS_${PN}-eldap="" -FILES_${PN}-eldap="${libdir}/erlang/lib/eldap-* " - -ALLOW_EMPTY_${PN}-edoc-staticdev="1" -DESCRIPTION_${PN}-edoc-staticdev="" -RDEPENDS_${PN}-edoc-staticdev="" -FILES_${PN}-edoc-staticdev="${libdir}/erlang/lib/edoc-*/lib/*.a ${libdir}/erlang/lib/edoc-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-edoc-dev="1" -DESCRIPTION_${PN}-edoc-dev="" -RDEPENDS_${PN}-edoc-dev="" -FILES_${PN}-edoc-dev="${libdir}/erlang/lib/edoc-*/src ${libdir}/erlang/lib/edoc-*/include " - -ALLOW_EMPTY_${PN}-edoc-dbg="1" -DESCRIPTION_${PN}-edoc-dbg="" -RDEPENDS_${PN}-edoc-dbg="" -FILES_${PN}-edoc-dbg="${libdir}/erlang/lib/edoc-*/bin/.debug ${libdir}/erlang/lib/edoc-*/lib/.debug ${libdir}/erlang/lib/edoc-*/priv/lib/.debug ${libdir}/erlang/lib/edoc-*/priv/obj/.debug ${libdir}/erlang/lib/edoc-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-edoc="1" -DESCRIPTION_${PN}-edoc="" -RDEPENDS_${PN}-edoc="" -FILES_${PN}-edoc="${libdir}/erlang/lib/edoc-* " - -ALLOW_EMPTY_${PN}-doc="1" -DESCRIPTION_${PN}-doc="" -RDEPENDS_${PN}-doc="" -FILES_${PN}-doc+="${libdir}/erlang/erts-*/doc ${libdir}/erlang/erts-*/man ${libdir}/erlang/lib/*/examples ${libdir}/erlang/misc " - -ALLOW_EMPTY_${PN}-diameter-staticdev="1" -DESCRIPTION_${PN}-diameter-staticdev="" -RDEPENDS_${PN}-diameter-staticdev="" -FILES_${PN}-diameter-staticdev="${libdir}/erlang/lib/diameter-*/lib/*.a ${libdir}/erlang/lib/diameter-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-diameter-dev="1" -DESCRIPTION_${PN}-diameter-dev="" -RDEPENDS_${PN}-diameter-dev="" -FILES_${PN}-diameter-dev="${libdir}/erlang/lib/diameter-*/src ${libdir}/erlang/lib/diameter-*/include " - -ALLOW_EMPTY_${PN}-diameter-dbg="1" -DESCRIPTION_${PN}-diameter-dbg="" -RDEPENDS_${PN}-diameter-dbg="" -FILES_${PN}-diameter-dbg="${libdir}/erlang/lib/diameter-*/bin/.debug ${libdir}/erlang/lib/diameter-*/lib/.debug ${libdir}/erlang/lib/diameter-*/priv/lib/.debug ${libdir}/erlang/lib/diameter-*/priv/obj/.debug ${libdir}/erlang/lib/diameter-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-diameter="1" -DESCRIPTION_${PN}-diameter="" -RDEPENDS_${PN}-diameter="" -FILES_${PN}-diameter="${libdir}/erlang/lib/diameter-* " - -ALLOW_EMPTY_${PN}-dialyzer-staticdev="1" -DESCRIPTION_${PN}-dialyzer-staticdev="" -RDEPENDS_${PN}-dialyzer-staticdev="" -FILES_${PN}-dialyzer-staticdev="${libdir}/erlang/lib/dialyzer-*/lib/*.a ${libdir}/erlang/lib/dialyzer-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-dialyzer-dev="1" -DESCRIPTION_${PN}-dialyzer-dev="" -RDEPENDS_${PN}-dialyzer-dev="" -FILES_${PN}-dialyzer-dev="${libdir}/erlang/lib/dialyzer-*/src ${libdir}/erlang/lib/dialyzer-*/include " - -ALLOW_EMPTY_${PN}-dialyzer-dbg="1" -DESCRIPTION_${PN}-dialyzer-dbg="" -RDEPENDS_${PN}-dialyzer-dbg="" -FILES_${PN}-dialyzer-dbg="${libdir}/erlang/lib/dialyzer-*/bin/.debug ${libdir}/erlang/lib/dialyzer-*/lib/.debug ${libdir}/erlang/lib/dialyzer-*/priv/lib/.debug ${libdir}/erlang/lib/dialyzer-*/priv/obj/.debug ${libdir}/erlang/lib/dialyzer-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-dialyzer="1" -DESCRIPTION_${PN}-dialyzer="" -RDEPENDS_${PN}-dialyzer="" -FILES_${PN}-dialyzer="${libdir}/erlang/lib/dialyzer-* " - -ALLOW_EMPTY_${PN}-dev="1" -DESCRIPTION_${PN}-dev="" -RDEPENDS_${PN}-dev="" -FILES_${PN}-dev+="${libdir}/erlang/erts-*/include ${libdir}/erlang/erts-*/src ${libdir}/erlang/usr/include " - -ALLOW_EMPTY_${PN}-debugger-staticdev="1" -DESCRIPTION_${PN}-debugger-staticdev="" -RDEPENDS_${PN}-debugger-staticdev="" -FILES_${PN}-debugger-staticdev="${libdir}/erlang/lib/debugger-*/lib/*.a ${libdir}/erlang/lib/debugger-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-debugger-dev="1" -DESCRIPTION_${PN}-debugger-dev="" -RDEPENDS_${PN}-debugger-dev="" -FILES_${PN}-debugger-dev="${libdir}/erlang/lib/debugger-*/src ${libdir}/erlang/lib/debugger-*/include " - -ALLOW_EMPTY_${PN}-debugger-dbg="1" -DESCRIPTION_${PN}-debugger-dbg="" -RDEPENDS_${PN}-debugger-dbg="" -FILES_${PN}-debugger-dbg="${libdir}/erlang/lib/debugger-*/bin/.debug ${libdir}/erlang/lib/debugger-*/lib/.debug ${libdir}/erlang/lib/debugger-*/priv/lib/.debug ${libdir}/erlang/lib/debugger-*/priv/obj/.debug ${libdir}/erlang/lib/debugger-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-debugger="1" -DESCRIPTION_${PN}-debugger="" -RDEPENDS_${PN}-debugger="" -FILES_${PN}-debugger="${libdir}/erlang/lib/debugger-* " - -ALLOW_EMPTY_${PN}-dbg="1" -DESCRIPTION_${PN}-dbg="" -RDEPENDS_${PN}-dbg="" -FILES_${PN}-dbg+="${libdir}/erlang/bin/.debug ${libdir}/erlang/erts-*/bin/.debug " - -ALLOW_EMPTY_${PN}-crypto-staticdev="1" -DESCRIPTION_${PN}-crypto-staticdev="" -RDEPENDS_${PN}-crypto-staticdev="" -FILES_${PN}-crypto-staticdev="${libdir}/erlang/lib/crypto-*/lib/*.a ${libdir}/erlang/lib/crypto-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-crypto-dev="1" -DESCRIPTION_${PN}-crypto-dev="" -RDEPENDS_${PN}-crypto-dev="" -FILES_${PN}-crypto-dev="${libdir}/erlang/lib/crypto-*/src ${libdir}/erlang/lib/crypto-*/include " - -ALLOW_EMPTY_${PN}-crypto-dbg="1" -DESCRIPTION_${PN}-crypto-dbg="" -RDEPENDS_${PN}-crypto-dbg="" -FILES_${PN}-crypto-dbg="${libdir}/erlang/lib/crypto-*/bin/.debug ${libdir}/erlang/lib/crypto-*/lib/.debug ${libdir}/erlang/lib/crypto-*/priv/lib/.debug ${libdir}/erlang/lib/crypto-*/priv/obj/.debug ${libdir}/erlang/lib/crypto-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-crypto="1" -DESCRIPTION_${PN}-crypto="" -RDEPENDS_${PN}-crypto="" -FILES_${PN}-crypto="${libdir}/erlang/lib/crypto-* " - -ALLOW_EMPTY_${PN}-costransactions-staticdev="1" -DESCRIPTION_${PN}-costransactions-staticdev="" -RDEPENDS_${PN}-costransactions-staticdev="" -FILES_${PN}-costransactions-staticdev="${libdir}/erlang/lib/cosTransactions-*/lib/*.a ${libdir}/erlang/lib/cosTransactions-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-costransactions-dev="1" -DESCRIPTION_${PN}-costransactions-dev="" -RDEPENDS_${PN}-costransactions-dev="" -FILES_${PN}-costransactions-dev="${libdir}/erlang/lib/cosTransactions-*/src ${libdir}/erlang/lib/cosTransactions-*/include " - -ALLOW_EMPTY_${PN}-costransactions-dbg="1" -DESCRIPTION_${PN}-costransactions-dbg="" -RDEPENDS_${PN}-costransactions-dbg="" -FILES_${PN}-costransactions-dbg="${libdir}/erlang/lib/cosTransactions-*/bin/.debug ${libdir}/erlang/lib/cosTransactions-*/lib/.debug ${libdir}/erlang/lib/cosTransactions-*/priv/lib/.debug ${libdir}/erlang/lib/cosTransactions-*/priv/obj/.debug ${libdir}/erlang/lib/cosTransactions-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-costransactions="1" -DESCRIPTION_${PN}-costransactions="" -RDEPENDS_${PN}-costransactions="" -FILES_${PN}-costransactions="${libdir}/erlang/lib/cosTransactions-* " - -ALLOW_EMPTY_${PN}-costime-staticdev="1" -DESCRIPTION_${PN}-costime-staticdev="" -RDEPENDS_${PN}-costime-staticdev="" -FILES_${PN}-costime-staticdev="${libdir}/erlang/lib/cosTime-*/lib/*.a ${libdir}/erlang/lib/cosTime-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-costime-dev="1" -DESCRIPTION_${PN}-costime-dev="" -RDEPENDS_${PN}-costime-dev="" -FILES_${PN}-costime-dev="${libdir}/erlang/lib/cosTime-*/src ${libdir}/erlang/lib/cosTime-*/include " - -ALLOW_EMPTY_${PN}-costime-dbg="1" -DESCRIPTION_${PN}-costime-dbg="" -RDEPENDS_${PN}-costime-dbg="" -FILES_${PN}-costime-dbg="${libdir}/erlang/lib/cosTime-*/bin/.debug ${libdir}/erlang/lib/cosTime-*/lib/.debug ${libdir}/erlang/lib/cosTime-*/priv/lib/.debug ${libdir}/erlang/lib/cosTime-*/priv/obj/.debug ${libdir}/erlang/lib/cosTime-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-costime="1" -DESCRIPTION_${PN}-costime="" -RDEPENDS_${PN}-costime="" -FILES_${PN}-costime="${libdir}/erlang/lib/cosTime-* " - -ALLOW_EMPTY_${PN}-cosproperty-staticdev="1" -DESCRIPTION_${PN}-cosproperty-staticdev="" -RDEPENDS_${PN}-cosproperty-staticdev="" -FILES_${PN}-cosproperty-staticdev="${libdir}/erlang/lib/cosProperty-*/lib/*.a ${libdir}/erlang/lib/cosProperty-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-cosproperty-dev="1" -DESCRIPTION_${PN}-cosproperty-dev="" -RDEPENDS_${PN}-cosproperty-dev="" -FILES_${PN}-cosproperty-dev="${libdir}/erlang/lib/cosProperty-*/src ${libdir}/erlang/lib/cosProperty-*/include " - -ALLOW_EMPTY_${PN}-cosproperty-dbg="1" -DESCRIPTION_${PN}-cosproperty-dbg="" -RDEPENDS_${PN}-cosproperty-dbg="" -FILES_${PN}-cosproperty-dbg="${libdir}/erlang/lib/cosProperty-*/bin/.debug ${libdir}/erlang/lib/cosProperty-*/lib/.debug ${libdir}/erlang/lib/cosProperty-*/priv/lib/.debug ${libdir}/erlang/lib/cosProperty-*/priv/obj/.debug ${libdir}/erlang/lib/cosProperty-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-cosproperty="1" -DESCRIPTION_${PN}-cosproperty="" -RDEPENDS_${PN}-cosproperty="" -FILES_${PN}-cosproperty="${libdir}/erlang/lib/cosProperty-* " - -ALLOW_EMPTY_${PN}-cosnotification-staticdev="1" -DESCRIPTION_${PN}-cosnotification-staticdev="" -RDEPENDS_${PN}-cosnotification-staticdev="" -FILES_${PN}-cosnotification-staticdev="${libdir}/erlang/lib/cosNotification-*/lib/*.a ${libdir}/erlang/lib/cosNotification-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-cosnotification-dev="1" -DESCRIPTION_${PN}-cosnotification-dev="" -RDEPENDS_${PN}-cosnotification-dev="" -FILES_${PN}-cosnotification-dev="${libdir}/erlang/lib/cosNotification-*/src ${libdir}/erlang/lib/cosNotification-*/include " - -ALLOW_EMPTY_${PN}-cosnotification-dbg="1" -DESCRIPTION_${PN}-cosnotification-dbg="" -RDEPENDS_${PN}-cosnotification-dbg="" -FILES_${PN}-cosnotification-dbg="${libdir}/erlang/lib/cosNotification-*/bin/.debug ${libdir}/erlang/lib/cosNotification-*/lib/.debug ${libdir}/erlang/lib/cosNotification-*/priv/lib/.debug ${libdir}/erlang/lib/cosNotification-*/priv/obj/.debug ${libdir}/erlang/lib/cosNotification-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-cosnotification="1" -DESCRIPTION_${PN}-cosnotification="" -RDEPENDS_${PN}-cosnotification="" -FILES_${PN}-cosnotification="${libdir}/erlang/lib/cosNotification-* " - -ALLOW_EMPTY_${PN}-cosfiletransfer-staticdev="1" -DESCRIPTION_${PN}-cosfiletransfer-staticdev="" -RDEPENDS_${PN}-cosfiletransfer-staticdev="" -FILES_${PN}-cosfiletransfer-staticdev="${libdir}/erlang/lib/cosFileTransfer-*/lib/*.a ${libdir}/erlang/lib/cosFileTransfer-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-cosfiletransfer-dev="1" -DESCRIPTION_${PN}-cosfiletransfer-dev="" -RDEPENDS_${PN}-cosfiletransfer-dev="" -FILES_${PN}-cosfiletransfer-dev="${libdir}/erlang/lib/cosFileTransfer-*/src ${libdir}/erlang/lib/cosFileTransfer-*/include " - -ALLOW_EMPTY_${PN}-cosfiletransfer-dbg="1" -DESCRIPTION_${PN}-cosfiletransfer-dbg="" -RDEPENDS_${PN}-cosfiletransfer-dbg="" -FILES_${PN}-cosfiletransfer-dbg="${libdir}/erlang/lib/cosFileTransfer-*/bin/.debug ${libdir}/erlang/lib/cosFileTransfer-*/lib/.debug ${libdir}/erlang/lib/cosFileTransfer-*/priv/lib/.debug ${libdir}/erlang/lib/cosFileTransfer-*/priv/obj/.debug ${libdir}/erlang/lib/cosFileTransfer-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-cosfiletransfer="1" -DESCRIPTION_${PN}-cosfiletransfer="" -RDEPENDS_${PN}-cosfiletransfer="" -FILES_${PN}-cosfiletransfer="${libdir}/erlang/lib/cosFileTransfer-* " - -ALLOW_EMPTY_${PN}-coseventdomain-staticdev="1" -DESCRIPTION_${PN}-coseventdomain-staticdev="" -RDEPENDS_${PN}-coseventdomain-staticdev="" -FILES_${PN}-coseventdomain-staticdev="${libdir}/erlang/lib/cosEventDomain-*/lib/*.a ${libdir}/erlang/lib/cosEventDomain-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-coseventdomain-dev="1" -DESCRIPTION_${PN}-coseventdomain-dev="" -RDEPENDS_${PN}-coseventdomain-dev="" -FILES_${PN}-coseventdomain-dev="${libdir}/erlang/lib/cosEventDomain-*/src ${libdir}/erlang/lib/cosEventDomain-*/include " - -ALLOW_EMPTY_${PN}-coseventdomain-dbg="1" -DESCRIPTION_${PN}-coseventdomain-dbg="" -RDEPENDS_${PN}-coseventdomain-dbg="" -FILES_${PN}-coseventdomain-dbg="${libdir}/erlang/lib/cosEventDomain-*/bin/.debug ${libdir}/erlang/lib/cosEventDomain-*/lib/.debug ${libdir}/erlang/lib/cosEventDomain-*/priv/lib/.debug ${libdir}/erlang/lib/cosEventDomain-*/priv/obj/.debug ${libdir}/erlang/lib/cosEventDomain-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-coseventdomain="1" -DESCRIPTION_${PN}-coseventdomain="" -RDEPENDS_${PN}-coseventdomain="" -FILES_${PN}-coseventdomain="${libdir}/erlang/lib/cosEventDomain-* " - -ALLOW_EMPTY_${PN}-cosevent-staticdev="1" -DESCRIPTION_${PN}-cosevent-staticdev="" -RDEPENDS_${PN}-cosevent-staticdev="" -FILES_${PN}-cosevent-staticdev="${libdir}/erlang/lib/cosEvent-*/lib/*.a ${libdir}/erlang/lib/cosEvent-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-cosevent-dev="1" -DESCRIPTION_${PN}-cosevent-dev="" -RDEPENDS_${PN}-cosevent-dev="" -FILES_${PN}-cosevent-dev="${libdir}/erlang/lib/cosEvent-*/src ${libdir}/erlang/lib/cosEvent-*/include " - -ALLOW_EMPTY_${PN}-cosevent-dbg="1" -DESCRIPTION_${PN}-cosevent-dbg="" -RDEPENDS_${PN}-cosevent-dbg="" -FILES_${PN}-cosevent-dbg="${libdir}/erlang/lib/cosEvent-*/bin/.debug ${libdir}/erlang/lib/cosEvent-*/lib/.debug ${libdir}/erlang/lib/cosEvent-*/priv/lib/.debug ${libdir}/erlang/lib/cosEvent-*/priv/obj/.debug ${libdir}/erlang/lib/cosEvent-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-cosevent="1" -DESCRIPTION_${PN}-cosevent="" -RDEPENDS_${PN}-cosevent="" -FILES_${PN}-cosevent="${libdir}/erlang/lib/cosEvent-* " - -ALLOW_EMPTY_${PN}-compiler-staticdev="1" -DESCRIPTION_${PN}-compiler-staticdev="" -RDEPENDS_${PN}-compiler-staticdev="" -FILES_${PN}-compiler-staticdev="${libdir}/erlang/lib/compiler-*/lib/*.a ${libdir}/erlang/lib/compiler-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-compiler-dev="1" -DESCRIPTION_${PN}-compiler-dev="" -RDEPENDS_${PN}-compiler-dev="" -FILES_${PN}-compiler-dev="${libdir}/erlang/lib/compiler-*/src ${libdir}/erlang/lib/compiler-*/include " - -ALLOW_EMPTY_${PN}-compiler-dbg="1" -DESCRIPTION_${PN}-compiler-dbg="" -RDEPENDS_${PN}-compiler-dbg="" -FILES_${PN}-compiler-dbg="${libdir}/erlang/lib/compiler-*/bin/.debug ${libdir}/erlang/lib/compiler-*/lib/.debug ${libdir}/erlang/lib/compiler-*/priv/lib/.debug ${libdir}/erlang/lib/compiler-*/priv/obj/.debug ${libdir}/erlang/lib/compiler-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-compiler="1" -DESCRIPTION_${PN}-compiler="" -RDEPENDS_${PN}-compiler="" -FILES_${PN}-compiler="${libdir}/erlang/lib/compiler-* " - -ALLOW_EMPTY_${PN}-common-test-staticdev="1" -DESCRIPTION_${PN}-common-test-staticdev="" -RDEPENDS_${PN}-common-test-staticdev="" -FILES_${PN}-common-test-staticdev="${libdir}/erlang/lib/common_test-*/lib/*.a ${libdir}/erlang/lib/common_test-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-common-test-dev="1" -DESCRIPTION_${PN}-common-test-dev="" -RDEPENDS_${PN}-common-test-dev="" -FILES_${PN}-common-test-dev="${libdir}/erlang/lib/common_test-*/src ${libdir}/erlang/lib/common_test-*/include " - -ALLOW_EMPTY_${PN}-common-test-dbg="1" -DESCRIPTION_${PN}-common-test-dbg="" -RDEPENDS_${PN}-common-test-dbg="" -FILES_${PN}-common-test-dbg="${libdir}/erlang/lib/common_test-*/bin/.debug ${libdir}/erlang/lib/common_test-*/lib/.debug ${libdir}/erlang/lib/common_test-*/priv/lib/.debug ${libdir}/erlang/lib/common_test-*/priv/obj/.debug ${libdir}/erlang/lib/common_test-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-common-test="1" -DESCRIPTION_${PN}-common-test="" -RDEPENDS_${PN}-common-test="" -FILES_${PN}-common-test="${libdir}/erlang/lib/common_test-* " - -ALLOW_EMPTY_${PN}-asn1-staticdev="1" -DESCRIPTION_${PN}-asn1-staticdev="" -RDEPENDS_${PN}-asn1-staticdev="" -FILES_${PN}-asn1-staticdev="${libdir}/erlang/lib/asn1-*/lib/*.a ${libdir}/erlang/lib/asn1-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-asn1-dev="1" -DESCRIPTION_${PN}-asn1-dev="" -RDEPENDS_${PN}-asn1-dev="" -FILES_${PN}-asn1-dev="${libdir}/erlang/lib/asn1-*/src ${libdir}/erlang/lib/asn1-*/include " - -ALLOW_EMPTY_${PN}-asn1-dbg="1" -DESCRIPTION_${PN}-asn1-dbg="" -RDEPENDS_${PN}-asn1-dbg="" -FILES_${PN}-asn1-dbg="${libdir}/erlang/lib/asn1-*/bin/.debug ${libdir}/erlang/lib/asn1-*/lib/.debug ${libdir}/erlang/lib/asn1-*/priv/lib/.debug ${libdir}/erlang/lib/asn1-*/priv/obj/.debug ${libdir}/erlang/lib/asn1-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-asn1="1" -DESCRIPTION_${PN}-asn1="" -RDEPENDS_${PN}-asn1="" -FILES_${PN}-asn1="${libdir}/erlang/lib/asn1-* " - -ALLOW_EMPTY_${PN}-appmon-staticdev="1" -DESCRIPTION_${PN}-appmon-staticdev="" -RDEPENDS_${PN}-appmon-staticdev="" -FILES_${PN}-appmon-staticdev="${libdir}/erlang/lib/appmon-*/lib/*.a ${libdir}/erlang/lib/appmon-*/priv/lib/*.a " - -ALLOW_EMPTY_${PN}-appmon-dev="1" -DESCRIPTION_${PN}-appmon-dev="" -RDEPENDS_${PN}-appmon-dev="" -FILES_${PN}-appmon-dev="${libdir}/erlang/lib/appmon-*/src ${libdir}/erlang/lib/appmon-*/include " - -ALLOW_EMPTY_${PN}-appmon-dbg="1" -DESCRIPTION_${PN}-appmon-dbg="" -RDEPENDS_${PN}-appmon-dbg="" -FILES_${PN}-appmon-dbg="${libdir}/erlang/lib/appmon-*/bin/.debug ${libdir}/erlang/lib/appmon-*/lib/.debug ${libdir}/erlang/lib/appmon-*/priv/lib/.debug ${libdir}/erlang/lib/appmon-*/priv/obj/.debug ${libdir}/erlang/lib/appmon-*/priv/bin/.debug " - -ALLOW_EMPTY_${PN}-appmon="1" -DESCRIPTION_${PN}-appmon="" -RDEPENDS_${PN}-appmon="" -FILES_${PN}-appmon="${libdir}/erlang/lib/appmon-* " - -ALLOW_EMPTY_${PN}="1" -DESCRIPTION_${PN}="" -RDEPENDS_${PN}="${PN}-erts ${PN}-kernel ${PN}-sasl ${PN}-stdlib" -FILES_${PN}+="${bindir} ${libdir}/erlang/releases ${libdir}/erlang/bin ${libdir}/erlang/erts-*/bin " - -DESCRIPTION_${PN}-modules="All Erlang modules" -RDEPENDS_${PN}-modules="${PN} ${PN}-appmon ${PN}-asn1 ${PN}-common-test ${PN}-compiler ${PN}-cosevent ${PN}-coseventdomain ${PN}-cosfiletransfer ${PN}-cosnotification ${PN}-cosproperty ${PN}-costime ${PN}-costransactions ${PN}-crypto ${PN}-debugger ${PN}-dialyzer ${PN}-diameter ${PN}-doc ${PN}-edoc ${PN}-eldap ${PN}-erl-docgen ${PN}-erl-interface ${PN}-erts ${PN}-et ${PN}-eunit ${PN}-gs ${PN}-hipe ${PN}-ic ${PN}-inets ${PN}-jinterface ${PN}-kernel ${PN}-kernel-doc ${PN}-megaco ${PN}-mnesia ${PN}-observer ${PN}-orber ${PN}-os-mon ${PN}-otp-mibs ${PN}-parsetools ${PN}-percept ${PN}-pman ${PN}-public-key ${PN}-reltool ${PN}-runtime-tools ${PN}-sasl ${PN}-sasl-doc ${PN}-snmp ${PN}-ssh ${PN}-ssl ${PN}-stdlib ${PN}-stdlib-doc ${PN}-syntax-tools ${PN}-test-server ${PN}-toolbar ${PN}-tools ${PN}-tv ${PN}-typer ${PN}-webtool ${PN}-xmerl " -ALLOW_EMPTY_${PN}-modules = "1" +ALLOW_EMPTY:${PN}-xmerl-staticdev="1" +DESCRIPTION:${PN}-xmerl-staticdev="" +RDEPENDS:${PN}-xmerl-staticdev="" +FILES:${PN}-xmerl-staticdev="${libdir}/erlang/lib/xmerl-*/lib/*.a ${libdir}/erlang/lib/xmerl-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-xmerl-dev="1" +DESCRIPTION:${PN}-xmerl-dev="" +RDEPENDS:${PN}-xmerl-dev="" +FILES:${PN}-xmerl-dev="${libdir}/erlang/lib/xmerl-*/src ${libdir}/erlang/lib/xmerl-*/include " + +ALLOW_EMPTY:${PN}-xmerl-dbg="1" +DESCRIPTION:${PN}-xmerl-dbg="" +RDEPENDS:${PN}-xmerl-dbg="" +FILES:${PN}-xmerl-dbg="${libdir}/erlang/lib/xmerl-*/bin/.debug ${libdir}/erlang/lib/xmerl-*/lib/.debug ${libdir}/erlang/lib/xmerl-*/priv/lib/.debug ${libdir}/erlang/lib/xmerl-*/priv/obj/.debug ${libdir}/erlang/lib/xmerl-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-xmerl="1" +DESCRIPTION:${PN}-xmerl="" +RDEPENDS:${PN}-xmerl="" +FILES:${PN}-xmerl="${libdir}/erlang/lib/xmerl-* " + +ALLOW_EMPTY:${PN}-webtool-staticdev="1" +DESCRIPTION:${PN}-webtool-staticdev="" +RDEPENDS:${PN}-webtool-staticdev="" +FILES:${PN}-webtool-staticdev="${libdir}/erlang/lib/webtool-*/lib/*.a ${libdir}/erlang/lib/webtool-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-webtool-dev="1" +DESCRIPTION:${PN}-webtool-dev="" +RDEPENDS:${PN}-webtool-dev="" +FILES:${PN}-webtool-dev="${libdir}/erlang/lib/webtool-*/src ${libdir}/erlang/lib/webtool-*/include " + +ALLOW_EMPTY:${PN}-webtool-dbg="1" +DESCRIPTION:${PN}-webtool-dbg="" +RDEPENDS:${PN}-webtool-dbg="" +FILES:${PN}-webtool-dbg="${libdir}/erlang/lib/webtool-*/bin/.debug ${libdir}/erlang/lib/webtool-*/lib/.debug ${libdir}/erlang/lib/webtool-*/priv/lib/.debug ${libdir}/erlang/lib/webtool-*/priv/obj/.debug ${libdir}/erlang/lib/webtool-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-webtool="1" +DESCRIPTION:${PN}-webtool="" +RDEPENDS:${PN}-webtool="" +FILES:${PN}-webtool="${libdir}/erlang/lib/webtool-* " + +ALLOW_EMPTY:${PN}-typer-staticdev="1" +DESCRIPTION:${PN}-typer-staticdev="" +RDEPENDS:${PN}-typer-staticdev="" +FILES:${PN}-typer-staticdev="${libdir}/erlang/lib/typer-*/lib/*.a ${libdir}/erlang/lib/typer-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-typer-dev="1" +DESCRIPTION:${PN}-typer-dev="" +RDEPENDS:${PN}-typer-dev="" +FILES:${PN}-typer-dev="${libdir}/erlang/lib/typer-*/src ${libdir}/erlang/lib/typer-*/include " + +ALLOW_EMPTY:${PN}-typer-dbg="1" +DESCRIPTION:${PN}-typer-dbg="" +RDEPENDS:${PN}-typer-dbg="" +FILES:${PN}-typer-dbg="${libdir}/erlang/lib/typer-*/bin/.debug ${libdir}/erlang/lib/typer-*/lib/.debug ${libdir}/erlang/lib/typer-*/priv/lib/.debug ${libdir}/erlang/lib/typer-*/priv/obj/.debug ${libdir}/erlang/lib/typer-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-typer="1" +DESCRIPTION:${PN}-typer="" +RDEPENDS:${PN}-typer="" +FILES:${PN}-typer="${libdir}/erlang/lib/typer-* " + +ALLOW_EMPTY:${PN}-tv-staticdev="1" +DESCRIPTION:${PN}-tv-staticdev="" +RDEPENDS:${PN}-tv-staticdev="" +FILES:${PN}-tv-staticdev="${libdir}/erlang/lib/tv-*/lib/*.a ${libdir}/erlang/lib/tv-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-tv-dev="1" +DESCRIPTION:${PN}-tv-dev="" +RDEPENDS:${PN}-tv-dev="" +FILES:${PN}-tv-dev="${libdir}/erlang/lib/tv-*/src ${libdir}/erlang/lib/tv-*/include " + +ALLOW_EMPTY:${PN}-tv-dbg="1" +DESCRIPTION:${PN}-tv-dbg="" +RDEPENDS:${PN}-tv-dbg="" +FILES:${PN}-tv-dbg="${libdir}/erlang/lib/tv-*/bin/.debug ${libdir}/erlang/lib/tv-*/lib/.debug ${libdir}/erlang/lib/tv-*/priv/lib/.debug ${libdir}/erlang/lib/tv-*/priv/obj/.debug ${libdir}/erlang/lib/tv-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-tv="1" +DESCRIPTION:${PN}-tv="" +RDEPENDS:${PN}-tv="" +FILES:${PN}-tv="${libdir}/erlang/lib/tv-* " + +ALLOW_EMPTY:${PN}-tools-staticdev="1" +DESCRIPTION:${PN}-tools-staticdev="" +RDEPENDS:${PN}-tools-staticdev="" +FILES:${PN}-tools-staticdev="${libdir}/erlang/lib/tools-*/lib/*.a ${libdir}/erlang/lib/tools-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-tools-dev="1" +DESCRIPTION:${PN}-tools-dev="" +RDEPENDS:${PN}-tools-dev="" +FILES:${PN}-tools-dev="${libdir}/erlang/lib/tools-*/src ${libdir}/erlang/lib/tools-*/include " + +ALLOW_EMPTY:${PN}-tools-dbg="1" +DESCRIPTION:${PN}-tools-dbg="" +RDEPENDS:${PN}-tools-dbg="" +FILES:${PN}-tools-dbg="${libdir}/erlang/lib/tools-*/bin/.debug ${libdir}/erlang/lib/tools-*/lib/.debug ${libdir}/erlang/lib/tools-*/priv/lib/.debug ${libdir}/erlang/lib/tools-*/priv/obj/.debug ${libdir}/erlang/lib/tools-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-tools="1" +DESCRIPTION:${PN}-tools="" +RDEPENDS:${PN}-tools="" +FILES:${PN}-tools="${libdir}/erlang/lib/tools-* " + +ALLOW_EMPTY:${PN}-toolbar-staticdev="1" +DESCRIPTION:${PN}-toolbar-staticdev="" +RDEPENDS:${PN}-toolbar-staticdev="" +FILES:${PN}-toolbar-staticdev="${libdir}/erlang/lib/toolbar-*/lib/*.a ${libdir}/erlang/lib/toolbar-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-toolbar-dev="1" +DESCRIPTION:${PN}-toolbar-dev="" +RDEPENDS:${PN}-toolbar-dev="" +FILES:${PN}-toolbar-dev="${libdir}/erlang/lib/toolbar-*/src ${libdir}/erlang/lib/toolbar-*/include " + +ALLOW_EMPTY:${PN}-toolbar-dbg="1" +DESCRIPTION:${PN}-toolbar-dbg="" +RDEPENDS:${PN}-toolbar-dbg="" +FILES:${PN}-toolbar-dbg="${libdir}/erlang/lib/toolbar-*/bin/.debug ${libdir}/erlang/lib/toolbar-*/lib/.debug ${libdir}/erlang/lib/toolbar-*/priv/lib/.debug ${libdir}/erlang/lib/toolbar-*/priv/obj/.debug ${libdir}/erlang/lib/toolbar-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-toolbar="1" +DESCRIPTION:${PN}-toolbar="" +RDEPENDS:${PN}-toolbar="" +FILES:${PN}-toolbar="${libdir}/erlang/lib/toolbar-* " + +ALLOW_EMPTY:${PN}-test-server-staticdev="1" +DESCRIPTION:${PN}-test-server-staticdev="" +RDEPENDS:${PN}-test-server-staticdev="" +FILES:${PN}-test-server-staticdev="${libdir}/erlang/lib/test_server-*/lib/*.a ${libdir}/erlang/lib/test_server-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-test-server-dev="1" +DESCRIPTION:${PN}-test-server-dev="" +RDEPENDS:${PN}-test-server-dev="" +FILES:${PN}-test-server-dev="${libdir}/erlang/lib/test_server-*/src ${libdir}/erlang/lib/test_server-*/include " + +ALLOW_EMPTY:${PN}-test-server-dbg="1" +DESCRIPTION:${PN}-test-server-dbg="" +RDEPENDS:${PN}-test-server-dbg="" +FILES:${PN}-test-server-dbg="${libdir}/erlang/lib/test_server-*/bin/.debug ${libdir}/erlang/lib/test_server-*/lib/.debug ${libdir}/erlang/lib/test_server-*/priv/lib/.debug ${libdir}/erlang/lib/test_server-*/priv/obj/.debug ${libdir}/erlang/lib/test_server-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-test-server="1" +DESCRIPTION:${PN}-test-server="" +RDEPENDS:${PN}-test-server="" +FILES:${PN}-test-server="${libdir}/erlang/lib/test_server-* " + +ALLOW_EMPTY:${PN}-syntax-tools-staticdev="1" +DESCRIPTION:${PN}-syntax-tools-staticdev="" +RDEPENDS:${PN}-syntax-tools-staticdev="" +FILES:${PN}-syntax-tools-staticdev="${libdir}/erlang/lib/syntax_tools-*/lib/*.a ${libdir}/erlang/lib/syntax_tools-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-syntax-tools-dev="1" +DESCRIPTION:${PN}-syntax-tools-dev="" +RDEPENDS:${PN}-syntax-tools-dev="" +FILES:${PN}-syntax-tools-dev="${libdir}/erlang/lib/syntax_tools-*/src ${libdir}/erlang/lib/syntax_tools-*/include " + +ALLOW_EMPTY:${PN}-syntax-tools-dbg="1" +DESCRIPTION:${PN}-syntax-tools-dbg="" +RDEPENDS:${PN}-syntax-tools-dbg="" +FILES:${PN}-syntax-tools-dbg="${libdir}/erlang/lib/syntax_tools-*/bin/.debug ${libdir}/erlang/lib/syntax_tools-*/lib/.debug ${libdir}/erlang/lib/syntax_tools-*/priv/lib/.debug ${libdir}/erlang/lib/syntax_tools-*/priv/obj/.debug ${libdir}/erlang/lib/syntax_tools-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-syntax-tools="1" +DESCRIPTION:${PN}-syntax-tools="" +RDEPENDS:${PN}-syntax-tools="" +FILES:${PN}-syntax-tools="${libdir}/erlang/lib/syntax_tools-* " + +ALLOW_EMPTY:${PN}-stdlib-staticdev="1" +DESCRIPTION:${PN}-stdlib-staticdev="" +RDEPENDS:${PN}-stdlib-staticdev="" +FILES:${PN}-stdlib-staticdev="${libdir}/erlang/lib/stdlib-*/lib/*.a ${libdir}/erlang/lib/stdlib-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-stdlib-doc="1" +DESCRIPTION:${PN}-stdlib-doc="" +RDEPENDS:${PN}-stdlib-doc="" +FILES:${PN}-stdlib-doc="${libdir}/erlang/lib/sasl-*/examples " + +ALLOW_EMPTY:${PN}-stdlib-dev="1" +DESCRIPTION:${PN}-stdlib-dev="" +RDEPENDS:${PN}-stdlib-dev="" +FILES:${PN}-stdlib-dev="${libdir}/erlang/lib/stdlib-*/src ${libdir}/erlang/lib/stdlib-*/include " + +ALLOW_EMPTY:${PN}-stdlib-dbg="1" +DESCRIPTION:${PN}-stdlib-dbg="" +RDEPENDS:${PN}-stdlib-dbg="" +FILES:${PN}-stdlib-dbg="${libdir}/erlang/lib/stdlib-*/bin/.debug ${libdir}/erlang/lib/stdlib-*/lib/.debug ${libdir}/erlang/lib/stdlib-*/priv/lib/.debug ${libdir}/erlang/lib/stdlib-*/priv/obj/.debug ${libdir}/erlang/lib/stdlib-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-stdlib="1" +DESCRIPTION:${PN}-stdlib="" +RDEPENDS:${PN}-stdlib="" +FILES:${PN}-stdlib="${libdir}/erlang/lib/stdlib-* " + +ALLOW_EMPTY:${PN}-staticdev="1" +DESCRIPTION:${PN}-staticdev="" +RDEPENDS:${PN}-staticdev="" +FILES:${PN}-staticdev+="${libdir}/erlang/usr/lib/*.a ${libdir}/erlang/usr/lib/internal/*.a ${libdir}/erlang/erts-*/lib/*.a ${libdir}/erlang/erts-*/lib/internal/* " + +ALLOW_EMPTY:${PN}-ssl-staticdev="1" +DESCRIPTION:${PN}-ssl-staticdev="" +RDEPENDS:${PN}-ssl-staticdev="" +FILES:${PN}-ssl-staticdev="${libdir}/erlang/lib/ssl-*/lib/*.a ${libdir}/erlang/lib/ssl-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-ssl-dev="1" +DESCRIPTION:${PN}-ssl-dev="" +RDEPENDS:${PN}-ssl-dev="" +FILES:${PN}-ssl-dev="${libdir}/erlang/lib/ssl-*/src ${libdir}/erlang/lib/ssl-*/include " + +ALLOW_EMPTY:${PN}-ssl-dbg="1" +DESCRIPTION:${PN}-ssl-dbg="" +RDEPENDS:${PN}-ssl-dbg="" +FILES:${PN}-ssl-dbg="${libdir}/erlang/lib/ssl-*/bin/.debug ${libdir}/erlang/lib/ssl-*/lib/.debug ${libdir}/erlang/lib/ssl-*/priv/lib/.debug ${libdir}/erlang/lib/ssl-*/priv/obj/.debug ${libdir}/erlang/lib/ssl-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-ssl="1" +DESCRIPTION:${PN}-ssl="" +RDEPENDS:${PN}-ssl="" +FILES:${PN}-ssl="${libdir}/erlang/lib/ssl-* " + +ALLOW_EMPTY:${PN}-ssh-staticdev="1" +DESCRIPTION:${PN}-ssh-staticdev="" +RDEPENDS:${PN}-ssh-staticdev="" +FILES:${PN}-ssh-staticdev="${libdir}/erlang/lib/ssh-*/lib/*.a ${libdir}/erlang/lib/ssh-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-ssh-dev="1" +DESCRIPTION:${PN}-ssh-dev="" +RDEPENDS:${PN}-ssh-dev="" +FILES:${PN}-ssh-dev="${libdir}/erlang/lib/ssh-*/src ${libdir}/erlang/lib/ssh-*/include " + +ALLOW_EMPTY:${PN}-ssh-dbg="1" +DESCRIPTION:${PN}-ssh-dbg="" +RDEPENDS:${PN}-ssh-dbg="" +FILES:${PN}-ssh-dbg="${libdir}/erlang/lib/ssh-*/bin/.debug ${libdir}/erlang/lib/ssh-*/lib/.debug ${libdir}/erlang/lib/ssh-*/priv/lib/.debug ${libdir}/erlang/lib/ssh-*/priv/obj/.debug ${libdir}/erlang/lib/ssh-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-ssh="1" +DESCRIPTION:${PN}-ssh="" +RDEPENDS:${PN}-ssh="" +FILES:${PN}-ssh="${libdir}/erlang/lib/ssh-* " + +ALLOW_EMPTY:${PN}-snmp-staticdev="1" +DESCRIPTION:${PN}-snmp-staticdev="" +RDEPENDS:${PN}-snmp-staticdev="" +FILES:${PN}-snmp-staticdev="${libdir}/erlang/lib/snmp-*/lib/*.a ${libdir}/erlang/lib/snmp-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-snmp-dev="1" +DESCRIPTION:${PN}-snmp-dev="" +RDEPENDS:${PN}-snmp-dev="" +FILES:${PN}-snmp-dev="${libdir}/erlang/lib/snmp-*/src ${libdir}/erlang/lib/snmp-*/include " + +ALLOW_EMPTY:${PN}-snmp-dbg="1" +DESCRIPTION:${PN}-snmp-dbg="" +RDEPENDS:${PN}-snmp-dbg="" +FILES:${PN}-snmp-dbg="${libdir}/erlang/lib/snmp-*/bin/.debug ${libdir}/erlang/lib/snmp-*/lib/.debug ${libdir}/erlang/lib/snmp-*/priv/lib/.debug ${libdir}/erlang/lib/snmp-*/priv/obj/.debug ${libdir}/erlang/lib/snmp-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-snmp="1" +DESCRIPTION:${PN}-snmp="" +RDEPENDS:${PN}-snmp="" +FILES:${PN}-snmp="${libdir}/erlang/lib/snmp-* " + +ALLOW_EMPTY:${PN}-sasl-staticdev="1" +DESCRIPTION:${PN}-sasl-staticdev="" +RDEPENDS:${PN}-sasl-staticdev="" +FILES:${PN}-sasl-staticdev="${libdir}/erlang/lib/sasl-*/lib/*.a ${libdir}/erlang/lib/sasl-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-sasl-doc="1" +DESCRIPTION:${PN}-sasl-doc="" +RDEPENDS:${PN}-sasl-doc="" +FILES:${PN}-sasl-doc="${libdir}/erlang/lib/sasl-*/examples " + +ALLOW_EMPTY:${PN}-sasl-dev="1" +DESCRIPTION:${PN}-sasl-dev="" +RDEPENDS:${PN}-sasl-dev="" +FILES:${PN}-sasl-dev="${libdir}/erlang/lib/sasl-*/src ${libdir}/erlang/lib/sasl-*/include " + +ALLOW_EMPTY:${PN}-sasl-dbg="1" +DESCRIPTION:${PN}-sasl-dbg="" +RDEPENDS:${PN}-sasl-dbg="" +FILES:${PN}-sasl-dbg="${libdir}/erlang/lib/sasl-*/bin/.debug ${libdir}/erlang/lib/sasl-*/lib/.debug ${libdir}/erlang/lib/sasl-*/priv/lib/.debug ${libdir}/erlang/lib/sasl-*/priv/obj/.debug ${libdir}/erlang/lib/sasl-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-sasl="1" +DESCRIPTION:${PN}-sasl="" +RDEPENDS:${PN}-sasl="" +FILES:${PN}-sasl="${libdir}/erlang/lib/sasl-* " + +ALLOW_EMPTY:${PN}-runtime-tools-staticdev="1" +DESCRIPTION:${PN}-runtime-tools-staticdev="" +RDEPENDS:${PN}-runtime-tools-staticdev="" +FILES:${PN}-runtime-tools-staticdev="${libdir}/erlang/lib/runtime_tools-*/lib/*.a ${libdir}/erlang/lib/runtime_tools-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-runtime-tools-dev="1" +DESCRIPTION:${PN}-runtime-tools-dev="" +RDEPENDS:${PN}-runtime-tools-dev="" +FILES:${PN}-runtime-tools-dev="${libdir}/erlang/lib/runtime_tools-*/src ${libdir}/erlang/lib/runtime_tools-*/include " + +ALLOW_EMPTY:${PN}-runtime-tools-dbg="1" +DESCRIPTION:${PN}-runtime-tools-dbg="" +RDEPENDS:${PN}-runtime-tools-dbg="" +FILES:${PN}-runtime-tools-dbg="${libdir}/erlang/lib/runtime_tools-*/bin/.debug ${libdir}/erlang/lib/runtime_tools-*/lib/.debug ${libdir}/erlang/lib/runtime_tools-*/priv/lib/.debug ${libdir}/erlang/lib/runtime_tools-*/priv/obj/.debug ${libdir}/erlang/lib/runtime_tools-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-runtime-tools="1" +DESCRIPTION:${PN}-runtime-tools="" +RDEPENDS:${PN}-runtime-tools="" +FILES:${PN}-runtime-tools="${libdir}/erlang/lib/runtime_tools-* " + +ALLOW_EMPTY:${PN}-reltool-staticdev="1" +DESCRIPTION:${PN}-reltool-staticdev="" +RDEPENDS:${PN}-reltool-staticdev="" +FILES:${PN}-reltool-staticdev="${libdir}/erlang/lib/reltool-*/lib/*.a ${libdir}/erlang/lib/reltool-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-reltool-dev="1" +DESCRIPTION:${PN}-reltool-dev="" +RDEPENDS:${PN}-reltool-dev="" +FILES:${PN}-reltool-dev="${libdir}/erlang/lib/reltool-*/src ${libdir}/erlang/lib/reltool-*/include " + +ALLOW_EMPTY:${PN}-reltool-dbg="1" +DESCRIPTION:${PN}-reltool-dbg="" +RDEPENDS:${PN}-reltool-dbg="" +FILES:${PN}-reltool-dbg="${libdir}/erlang/lib/reltool-*/bin/.debug ${libdir}/erlang/lib/reltool-*/lib/.debug ${libdir}/erlang/lib/reltool-*/priv/lib/.debug ${libdir}/erlang/lib/reltool-*/priv/obj/.debug ${libdir}/erlang/lib/reltool-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-reltool="1" +DESCRIPTION:${PN}-reltool="" +RDEPENDS:${PN}-reltool="" +FILES:${PN}-reltool="${libdir}/erlang/lib/reltool-* " + +ALLOW_EMPTY:${PN}-public-key-staticdev="1" +DESCRIPTION:${PN}-public-key-staticdev="" +RDEPENDS:${PN}-public-key-staticdev="" +FILES:${PN}-public-key-staticdev="${libdir}/erlang/lib/public_key-*/lib/*.a ${libdir}/erlang/lib/public_key-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-public-key-dev="1" +DESCRIPTION:${PN}-public-key-dev="" +RDEPENDS:${PN}-public-key-dev="" +FILES:${PN}-public-key-dev="${libdir}/erlang/lib/public_key-*/src ${libdir}/erlang/lib/public_key-*/include " + +ALLOW_EMPTY:${PN}-public-key-dbg="1" +DESCRIPTION:${PN}-public-key-dbg="" +RDEPENDS:${PN}-public-key-dbg="" +FILES:${PN}-public-key-dbg="${libdir}/erlang/lib/public_key-*/bin/.debug ${libdir}/erlang/lib/public_key-*/lib/.debug ${libdir}/erlang/lib/public_key-*/priv/lib/.debug ${libdir}/erlang/lib/public_key-*/priv/obj/.debug ${libdir}/erlang/lib/public_key-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-public-key="1" +DESCRIPTION:${PN}-public-key="" +RDEPENDS:${PN}-public-key="" +FILES:${PN}-public-key="${libdir}/erlang/lib/public_key-* " + +ALLOW_EMPTY:${PN}-pman-staticdev="1" +DESCRIPTION:${PN}-pman-staticdev="" +RDEPENDS:${PN}-pman-staticdev="" +FILES:${PN}-pman-staticdev="${libdir}/erlang/lib/pman-*/lib/*.a ${libdir}/erlang/lib/pman-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-pman-dev="1" +DESCRIPTION:${PN}-pman-dev="" +RDEPENDS:${PN}-pman-dev="" +FILES:${PN}-pman-dev="${libdir}/erlang/lib/pman-*/src ${libdir}/erlang/lib/pman-*/include " + +ALLOW_EMPTY:${PN}-pman-dbg="1" +DESCRIPTION:${PN}-pman-dbg="" +RDEPENDS:${PN}-pman-dbg="" +FILES:${PN}-pman-dbg="${libdir}/erlang/lib/pman-*/bin/.debug ${libdir}/erlang/lib/pman-*/lib/.debug ${libdir}/erlang/lib/pman-*/priv/lib/.debug ${libdir}/erlang/lib/pman-*/priv/obj/.debug ${libdir}/erlang/lib/pman-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-pman="1" +DESCRIPTION:${PN}-pman="" +RDEPENDS:${PN}-pman="" +FILES:${PN}-pman="${libdir}/erlang/lib/pman-* " + +ALLOW_EMPTY:${PN}-percept-staticdev="1" +DESCRIPTION:${PN}-percept-staticdev="" +RDEPENDS:${PN}-percept-staticdev="" +FILES:${PN}-percept-staticdev="${libdir}/erlang/lib/percept-*/lib/*.a ${libdir}/erlang/lib/percept-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-percept-dev="1" +DESCRIPTION:${PN}-percept-dev="" +RDEPENDS:${PN}-percept-dev="" +FILES:${PN}-percept-dev="${libdir}/erlang/lib/percept-*/src ${libdir}/erlang/lib/percept-*/include " + +ALLOW_EMPTY:${PN}-percept-dbg="1" +DESCRIPTION:${PN}-percept-dbg="" +RDEPENDS:${PN}-percept-dbg="" +FILES:${PN}-percept-dbg="${libdir}/erlang/lib/percept-*/bin/.debug ${libdir}/erlang/lib/percept-*/lib/.debug ${libdir}/erlang/lib/percept-*/priv/lib/.debug ${libdir}/erlang/lib/percept-*/priv/obj/.debug ${libdir}/erlang/lib/percept-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-percept="1" +DESCRIPTION:${PN}-percept="" +RDEPENDS:${PN}-percept="" +FILES:${PN}-percept="${libdir}/erlang/lib/percept-* " + +ALLOW_EMPTY:${PN}-parsetools-staticdev="1" +DESCRIPTION:${PN}-parsetools-staticdev="" +RDEPENDS:${PN}-parsetools-staticdev="" +FILES:${PN}-parsetools-staticdev="${libdir}/erlang/lib/parsetools-*/lib/*.a ${libdir}/erlang/lib/parsetools-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-parsetools-dev="1" +DESCRIPTION:${PN}-parsetools-dev="" +RDEPENDS:${PN}-parsetools-dev="" +FILES:${PN}-parsetools-dev="${libdir}/erlang/lib/parsetools-*/src ${libdir}/erlang/lib/parsetools-*/include " + +ALLOW_EMPTY:${PN}-parsetools-dbg="1" +DESCRIPTION:${PN}-parsetools-dbg="" +RDEPENDS:${PN}-parsetools-dbg="" +FILES:${PN}-parsetools-dbg="${libdir}/erlang/lib/parsetools-*/bin/.debug ${libdir}/erlang/lib/parsetools-*/lib/.debug ${libdir}/erlang/lib/parsetools-*/priv/lib/.debug ${libdir}/erlang/lib/parsetools-*/priv/obj/.debug ${libdir}/erlang/lib/parsetools-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-parsetools="1" +DESCRIPTION:${PN}-parsetools="" +RDEPENDS:${PN}-parsetools="" +FILES:${PN}-parsetools="${libdir}/erlang/lib/parsetools-* " + +ALLOW_EMPTY:${PN}-otp-mibs-staticdev="1" +DESCRIPTION:${PN}-otp-mibs-staticdev="" +RDEPENDS:${PN}-otp-mibs-staticdev="" +FILES:${PN}-otp-mibs-staticdev="${libdir}/erlang/lib/otp_mibs-*/lib/*.a ${libdir}/erlang/lib/otp_mibs-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-otp-mibs-dev="1" +DESCRIPTION:${PN}-otp-mibs-dev="" +RDEPENDS:${PN}-otp-mibs-dev="" +FILES:${PN}-otp-mibs-dev="${libdir}/erlang/lib/otp_mibs-*/src ${libdir}/erlang/lib/otp_mibs-*/include " + +ALLOW_EMPTY:${PN}-otp-mibs-dbg="1" +DESCRIPTION:${PN}-otp-mibs-dbg="" +RDEPENDS:${PN}-otp-mibs-dbg="" +FILES:${PN}-otp-mibs-dbg="${libdir}/erlang/lib/otp_mibs-*/bin/.debug ${libdir}/erlang/lib/otp_mibs-*/lib/.debug ${libdir}/erlang/lib/otp_mibs-*/priv/lib/.debug ${libdir}/erlang/lib/otp_mibs-*/priv/obj/.debug ${libdir}/erlang/lib/otp_mibs-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-otp-mibs="1" +DESCRIPTION:${PN}-otp-mibs="" +RDEPENDS:${PN}-otp-mibs="" +FILES:${PN}-otp-mibs="${libdir}/erlang/lib/otp_mibs-* " + +ALLOW_EMPTY:${PN}-os-mon-staticdev="1" +DESCRIPTION:${PN}-os-mon-staticdev="" +RDEPENDS:${PN}-os-mon-staticdev="" +FILES:${PN}-os-mon-staticdev="${libdir}/erlang/lib/os_mon-*/lib/*.a ${libdir}/erlang/lib/os_mon-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-os-mon-dev="1" +DESCRIPTION:${PN}-os-mon-dev="" +RDEPENDS:${PN}-os-mon-dev="" +FILES:${PN}-os-mon-dev="${libdir}/erlang/lib/os_mon-*/src ${libdir}/erlang/lib/os_mon-*/include " + +ALLOW_EMPTY:${PN}-os-mon-dbg="1" +DESCRIPTION:${PN}-os-mon-dbg="" +RDEPENDS:${PN}-os-mon-dbg="" +FILES:${PN}-os-mon-dbg="${libdir}/erlang/lib/os_mon-*/bin/.debug ${libdir}/erlang/lib/os_mon-*/lib/.debug ${libdir}/erlang/lib/os_mon-*/priv/lib/.debug ${libdir}/erlang/lib/os_mon-*/priv/obj/.debug ${libdir}/erlang/lib/os_mon-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-os-mon="1" +DESCRIPTION:${PN}-os-mon="" +RDEPENDS:${PN}-os-mon="" +FILES:${PN}-os-mon="${libdir}/erlang/lib/os_mon-* " + +ALLOW_EMPTY:${PN}-orber-staticdev="1" +DESCRIPTION:${PN}-orber-staticdev="" +RDEPENDS:${PN}-orber-staticdev="" +FILES:${PN}-orber-staticdev="${libdir}/erlang/lib/orber-*/lib/*.a ${libdir}/erlang/lib/orber-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-orber-dev="1" +DESCRIPTION:${PN}-orber-dev="" +RDEPENDS:${PN}-orber-dev="" +FILES:${PN}-orber-dev="${libdir}/erlang/lib/orber-*/src ${libdir}/erlang/lib/orber-*/include " + +ALLOW_EMPTY:${PN}-orber-dbg="1" +DESCRIPTION:${PN}-orber-dbg="" +RDEPENDS:${PN}-orber-dbg="" +FILES:${PN}-orber-dbg="${libdir}/erlang/lib/orber-*/bin/.debug ${libdir}/erlang/lib/orber-*/lib/.debug ${libdir}/erlang/lib/orber-*/priv/lib/.debug ${libdir}/erlang/lib/orber-*/priv/obj/.debug ${libdir}/erlang/lib/orber-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-orber="1" +DESCRIPTION:${PN}-orber="" +RDEPENDS:${PN}-orber="" +FILES:${PN}-orber="${libdir}/erlang/lib/orber-* " + +ALLOW_EMPTY:${PN}-observer-staticdev="1" +DESCRIPTION:${PN}-observer-staticdev="" +RDEPENDS:${PN}-observer-staticdev="" +FILES:${PN}-observer-staticdev="${libdir}/erlang/lib/observer-*/lib/*.a ${libdir}/erlang/lib/observer-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-observer-dev="1" +DESCRIPTION:${PN}-observer-dev="" +RDEPENDS:${PN}-observer-dev="" +FILES:${PN}-observer-dev="${libdir}/erlang/lib/observer-*/src ${libdir}/erlang/lib/observer-*/include " + +ALLOW_EMPTY:${PN}-observer-dbg="1" +DESCRIPTION:${PN}-observer-dbg="" +RDEPENDS:${PN}-observer-dbg="" +FILES:${PN}-observer-dbg="${libdir}/erlang/lib/observer-*/bin/.debug ${libdir}/erlang/lib/observer-*/lib/.debug ${libdir}/erlang/lib/observer-*/priv/lib/.debug ${libdir}/erlang/lib/observer-*/priv/obj/.debug ${libdir}/erlang/lib/observer-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-observer="1" +DESCRIPTION:${PN}-observer="" +RDEPENDS:${PN}-observer="" +FILES:${PN}-observer="${libdir}/erlang/lib/observer-* " + +ALLOW_EMPTY:${PN}-mnesia-staticdev="1" +DESCRIPTION:${PN}-mnesia-staticdev="" +RDEPENDS:${PN}-mnesia-staticdev="" +FILES:${PN}-mnesia-staticdev="${libdir}/erlang/lib/mnesia-*/lib/*.a ${libdir}/erlang/lib/mnesia-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-mnesia-dev="1" +DESCRIPTION:${PN}-mnesia-dev="" +RDEPENDS:${PN}-mnesia-dev="" +FILES:${PN}-mnesia-dev="${libdir}/erlang/lib/mnesia-*/src ${libdir}/erlang/lib/mnesia-*/include " + +ALLOW_EMPTY:${PN}-mnesia-dbg="1" +DESCRIPTION:${PN}-mnesia-dbg="" +RDEPENDS:${PN}-mnesia-dbg="" +FILES:${PN}-mnesia-dbg="${libdir}/erlang/lib/mnesia-*/bin/.debug ${libdir}/erlang/lib/mnesia-*/lib/.debug ${libdir}/erlang/lib/mnesia-*/priv/lib/.debug ${libdir}/erlang/lib/mnesia-*/priv/obj/.debug ${libdir}/erlang/lib/mnesia-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-mnesia="1" +DESCRIPTION:${PN}-mnesia="" +RDEPENDS:${PN}-mnesia="" +FILES:${PN}-mnesia="${libdir}/erlang/lib/mnesia-* " + +ALLOW_EMPTY:${PN}-megaco-staticdev="1" +DESCRIPTION:${PN}-megaco-staticdev="" +RDEPENDS:${PN}-megaco-staticdev="" +FILES:${PN}-megaco-staticdev="${libdir}/erlang/lib/megaco-*/lib/*.a ${libdir}/erlang/lib/megaco-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-megaco-dev="1" +DESCRIPTION:${PN}-megaco-dev="" +RDEPENDS:${PN}-megaco-dev="" +FILES:${PN}-megaco-dev="${libdir}/erlang/lib/megaco-*/src ${libdir}/erlang/lib/megaco-*/include " + +ALLOW_EMPTY:${PN}-megaco-dbg="1" +DESCRIPTION:${PN}-megaco-dbg="" +RDEPENDS:${PN}-megaco-dbg="" +FILES:${PN}-megaco-dbg="${libdir}/erlang/lib/megaco-*/bin/.debug ${libdir}/erlang/lib/megaco-*/lib/.debug ${libdir}/erlang/lib/megaco-*/priv/lib/.debug ${libdir}/erlang/lib/megaco-*/priv/obj/.debug ${libdir}/erlang/lib/megaco-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-megaco="1" +DESCRIPTION:${PN}-megaco="" +RDEPENDS:${PN}-megaco="" +FILES:${PN}-megaco="${libdir}/erlang/lib/megaco-* " + +ALLOW_EMPTY:${PN}-kernel-staticdev="1" +DESCRIPTION:${PN}-kernel-staticdev="" +RDEPENDS:${PN}-kernel-staticdev="" +FILES:${PN}-kernel-staticdev="${libdir}/erlang/lib/kernel-*/lib/*.a ${libdir}/erlang/lib/kernel-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-kernel-doc="1" +DESCRIPTION:${PN}-kernel-doc="" +RDEPENDS:${PN}-kernel-doc="" +FILES:${PN}-kernel-doc="${libdir}/erlang/lib/kernel-*/examples " + +ALLOW_EMPTY:${PN}-kernel-dev="1" +DESCRIPTION:${PN}-kernel-dev="" +RDEPENDS:${PN}-kernel-dev="" +FILES:${PN}-kernel-dev="${libdir}/erlang/lib/kernel-*/src ${libdir}/erlang/lib/kernel-*/include " + +ALLOW_EMPTY:${PN}-kernel-dbg="1" +DESCRIPTION:${PN}-kernel-dbg="" +RDEPENDS:${PN}-kernel-dbg="" +FILES:${PN}-kernel-dbg="${libdir}/erlang/lib/kernel-*/bin/.debug ${libdir}/erlang/lib/kernel-*/lib/.debug ${libdir}/erlang/lib/kernel-*/priv/lib/.debug ${libdir}/erlang/lib/kernel-*/priv/obj/.debug ${libdir}/erlang/lib/kernel-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-kernel="1" +DESCRIPTION:${PN}-kernel="" +RDEPENDS:${PN}-kernel="" +FILES:${PN}-kernel="${libdir}/erlang/lib/kernel-* " + +ALLOW_EMPTY:${PN}-jinterface-staticdev="1" +DESCRIPTION:${PN}-jinterface-staticdev="" +RDEPENDS:${PN}-jinterface-staticdev="" +FILES:${PN}-jinterface-staticdev="${libdir}/erlang/lib/jinterface-*/lib/*.a ${libdir}/erlang/lib/jinterface-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-jinterface-dev="1" +DESCRIPTION:${PN}-jinterface-dev="" +RDEPENDS:${PN}-jinterface-dev="" +FILES:${PN}-jinterface-dev="${libdir}/erlang/lib/jinterface-*/src ${libdir}/erlang/lib/jinterface-*/include " + +ALLOW_EMPTY:${PN}-jinterface-dbg="1" +DESCRIPTION:${PN}-jinterface-dbg="" +RDEPENDS:${PN}-jinterface-dbg="" +FILES:${PN}-jinterface-dbg="${libdir}/erlang/lib/jinterface-*/bin/.debug ${libdir}/erlang/lib/jinterface-*/lib/.debug ${libdir}/erlang/lib/jinterface-*/priv/lib/.debug ${libdir}/erlang/lib/jinterface-*/priv/obj/.debug ${libdir}/erlang/lib/jinterface-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-jinterface="1" +DESCRIPTION:${PN}-jinterface="" +RDEPENDS:${PN}-jinterface="" +FILES:${PN}-jinterface="${libdir}/erlang/lib/jinterface-* " + +ALLOW_EMPTY:${PN}-inets-staticdev="1" +DESCRIPTION:${PN}-inets-staticdev="" +RDEPENDS:${PN}-inets-staticdev="" +FILES:${PN}-inets-staticdev="${libdir}/erlang/lib/inets-*/lib/*.a ${libdir}/erlang/lib/inets-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-inets-dev="1" +DESCRIPTION:${PN}-inets-dev="" +RDEPENDS:${PN}-inets-dev="" +FILES:${PN}-inets-dev="${libdir}/erlang/lib/inets-*/src ${libdir}/erlang/lib/inets-*/include " + +ALLOW_EMPTY:${PN}-inets-dbg="1" +DESCRIPTION:${PN}-inets-dbg="" +RDEPENDS:${PN}-inets-dbg="" +FILES:${PN}-inets-dbg="${libdir}/erlang/lib/inets-*/bin/.debug ${libdir}/erlang/lib/inets-*/lib/.debug ${libdir}/erlang/lib/inets-*/priv/lib/.debug ${libdir}/erlang/lib/inets-*/priv/obj/.debug ${libdir}/erlang/lib/inets-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-inets="1" +DESCRIPTION:${PN}-inets="" +RDEPENDS:${PN}-inets="" +FILES:${PN}-inets="${libdir}/erlang/lib/inets-* " + +ALLOW_EMPTY:${PN}-ic-staticdev="1" +DESCRIPTION:${PN}-ic-staticdev="" +RDEPENDS:${PN}-ic-staticdev="" +FILES:${PN}-ic-staticdev="${libdir}/erlang/lib/ic-*/lib/*.a ${libdir}/erlang/lib/ic-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-ic-dev="1" +DESCRIPTION:${PN}-ic-dev="" +RDEPENDS:${PN}-ic-dev="" +FILES:${PN}-ic-dev="${libdir}/erlang/lib/ic-*/src ${libdir}/erlang/lib/ic-*/include " + +ALLOW_EMPTY:${PN}-ic-dbg="1" +DESCRIPTION:${PN}-ic-dbg="" +RDEPENDS:${PN}-ic-dbg="" +FILES:${PN}-ic-dbg="${libdir}/erlang/lib/ic-*/bin/.debug ${libdir}/erlang/lib/ic-*/lib/.debug ${libdir}/erlang/lib/ic-*/priv/lib/.debug ${libdir}/erlang/lib/ic-*/priv/obj/.debug ${libdir}/erlang/lib/ic-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-ic="1" +DESCRIPTION:${PN}-ic="" +RDEPENDS:${PN}-ic="" +FILES:${PN}-ic="${libdir}/erlang/lib/ic-* " + +ALLOW_EMPTY:${PN}-hipe-staticdev="1" +DESCRIPTION:${PN}-hipe-staticdev="" +RDEPENDS:${PN}-hipe-staticdev="" +FILES:${PN}-hipe-staticdev="${libdir}/erlang/lib/hipe-*/lib/*.a ${libdir}/erlang/lib/hipe-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-hipe-dev="1" +DESCRIPTION:${PN}-hipe-dev="" +RDEPENDS:${PN}-hipe-dev="" +FILES:${PN}-hipe-dev="${libdir}/erlang/lib/hipe-*/src ${libdir}/erlang/lib/hipe-*/include " + +ALLOW_EMPTY:${PN}-hipe-dbg="1" +DESCRIPTION:${PN}-hipe-dbg="" +RDEPENDS:${PN}-hipe-dbg="" +FILES:${PN}-hipe-dbg="${libdir}/erlang/lib/hipe-*/bin/.debug ${libdir}/erlang/lib/hipe-*/lib/.debug ${libdir}/erlang/lib/hipe-*/priv/lib/.debug ${libdir}/erlang/lib/hipe-*/priv/obj/.debug ${libdir}/erlang/lib/hipe-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-hipe="1" +DESCRIPTION:${PN}-hipe="" +RDEPENDS:${PN}-hipe="" +FILES:${PN}-hipe="${libdir}/erlang/lib/hipe-* " + +ALLOW_EMPTY:${PN}-gs-staticdev="1" +DESCRIPTION:${PN}-gs-staticdev="" +RDEPENDS:${PN}-gs-staticdev="" +FILES:${PN}-gs-staticdev="${libdir}/erlang/lib/gs-*/lib/*.a ${libdir}/erlang/lib/gs-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-gs-dev="1" +DESCRIPTION:${PN}-gs-dev="" +RDEPENDS:${PN}-gs-dev="" +FILES:${PN}-gs-dev="${libdir}/erlang/lib/gs-*/src ${libdir}/erlang/lib/gs-*/include " + +ALLOW_EMPTY:${PN}-gs-dbg="1" +DESCRIPTION:${PN}-gs-dbg="" +RDEPENDS:${PN}-gs-dbg="" +FILES:${PN}-gs-dbg="${libdir}/erlang/lib/gs-*/bin/.debug ${libdir}/erlang/lib/gs-*/lib/.debug ${libdir}/erlang/lib/gs-*/priv/lib/.debug ${libdir}/erlang/lib/gs-*/priv/obj/.debug ${libdir}/erlang/lib/gs-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-gs="1" +DESCRIPTION:${PN}-gs="" +RDEPENDS:${PN}-gs="" +FILES:${PN}-gs="${libdir}/erlang/lib/gs-* " + +ALLOW_EMPTY:${PN}-eunit-staticdev="1" +DESCRIPTION:${PN}-eunit-staticdev="" +RDEPENDS:${PN}-eunit-staticdev="" +FILES:${PN}-eunit-staticdev="${libdir}/erlang/lib/eunit-*/lib/*.a ${libdir}/erlang/lib/eunit-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-eunit-dev="1" +DESCRIPTION:${PN}-eunit-dev="" +RDEPENDS:${PN}-eunit-dev="" +FILES:${PN}-eunit-dev="${libdir}/erlang/lib/eunit-*/src ${libdir}/erlang/lib/eunit-*/include " + +ALLOW_EMPTY:${PN}-eunit-dbg="1" +DESCRIPTION:${PN}-eunit-dbg="" +RDEPENDS:${PN}-eunit-dbg="" +FILES:${PN}-eunit-dbg="${libdir}/erlang/lib/eunit-*/bin/.debug ${libdir}/erlang/lib/eunit-*/lib/.debug ${libdir}/erlang/lib/eunit-*/priv/lib/.debug ${libdir}/erlang/lib/eunit-*/priv/obj/.debug ${libdir}/erlang/lib/eunit-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-eunit="1" +DESCRIPTION:${PN}-eunit="" +RDEPENDS:${PN}-eunit="" +FILES:${PN}-eunit="${libdir}/erlang/lib/eunit-* " + +ALLOW_EMPTY:${PN}-et-staticdev="1" +DESCRIPTION:${PN}-et-staticdev="" +RDEPENDS:${PN}-et-staticdev="" +FILES:${PN}-et-staticdev="${libdir}/erlang/lib/et-*/lib/*.a ${libdir}/erlang/lib/et-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-et-dev="1" +DESCRIPTION:${PN}-et-dev="" +RDEPENDS:${PN}-et-dev="" +FILES:${PN}-et-dev="${libdir}/erlang/lib/et-*/src ${libdir}/erlang/lib/et-*/include " + +ALLOW_EMPTY:${PN}-et-dbg="1" +DESCRIPTION:${PN}-et-dbg="" +RDEPENDS:${PN}-et-dbg="" +FILES:${PN}-et-dbg="${libdir}/erlang/lib/et-*/bin/.debug ${libdir}/erlang/lib/et-*/lib/.debug ${libdir}/erlang/lib/et-*/priv/lib/.debug ${libdir}/erlang/lib/et-*/priv/obj/.debug ${libdir}/erlang/lib/et-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-et="1" +DESCRIPTION:${PN}-et="" +RDEPENDS:${PN}-et="" +FILES:${PN}-et="${libdir}/erlang/lib/et-* " + +ALLOW_EMPTY:${PN}-erts-staticdev="1" +DESCRIPTION:${PN}-erts-staticdev="" +RDEPENDS:${PN}-erts-staticdev="" +FILES:${PN}-erts-staticdev="${libdir}/erlang/lib/erts-*/lib/*.a ${libdir}/erlang/lib/erts-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-erts-dev="1" +DESCRIPTION:${PN}-erts-dev="" +RDEPENDS:${PN}-erts-dev="" +FILES:${PN}-erts-dev="${libdir}/erlang/lib/erts-*/src ${libdir}/erlang/lib/erts-*/include " + +ALLOW_EMPTY:${PN}-erts-dbg="1" +DESCRIPTION:${PN}-erts-dbg="" +RDEPENDS:${PN}-erts-dbg="" +FILES:${PN}-erts-dbg="${libdir}/erlang/lib/erts-*/bin/.debug ${libdir}/erlang/lib/erts-*/lib/.debug ${libdir}/erlang/lib/erts-*/priv/lib/.debug ${libdir}/erlang/lib/erts-*/priv/obj/.debug ${libdir}/erlang/lib/erts-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-erts="1" +DESCRIPTION:${PN}-erts="" +RDEPENDS:${PN}-erts="" +FILES:${PN}-erts="${libdir}/erlang/lib/erts-* " + +ALLOW_EMPTY:${PN}-erl-interface-staticdev="1" +DESCRIPTION:${PN}-erl-interface-staticdev="" +RDEPENDS:${PN}-erl-interface-staticdev="" +FILES:${PN}-erl-interface-staticdev="${libdir}/erlang/lib/erl_interface-*/lib/*.a ${libdir}/erlang/lib/erl_interface-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-erl-interface-dev="1" +DESCRIPTION:${PN}-erl-interface-dev="" +RDEPENDS:${PN}-erl-interface-dev="" +FILES:${PN}-erl-interface-dev="${libdir}/erlang/lib/erl_interface-*/src ${libdir}/erlang/lib/erl_interface-*/include " + +ALLOW_EMPTY:${PN}-erl-interface-dbg="1" +DESCRIPTION:${PN}-erl-interface-dbg="" +RDEPENDS:${PN}-erl-interface-dbg="" +FILES:${PN}-erl-interface-dbg="${libdir}/erlang/lib/erl_interface-*/bin/.debug ${libdir}/erlang/lib/erl_interface-*/lib/.debug ${libdir}/erlang/lib/erl_interface-*/priv/lib/.debug ${libdir}/erlang/lib/erl_interface-*/priv/obj/.debug ${libdir}/erlang/lib/erl_interface-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-erl-interface="1" +DESCRIPTION:${PN}-erl-interface="" +RDEPENDS:${PN}-erl-interface="" +FILES:${PN}-erl-interface="${libdir}/erlang/lib/erl_interface-* " + +ALLOW_EMPTY:${PN}-erl-docgen-staticdev="1" +DESCRIPTION:${PN}-erl-docgen-staticdev="" +RDEPENDS:${PN}-erl-docgen-staticdev="" +FILES:${PN}-erl-docgen-staticdev="${libdir}/erlang/lib/erl_docgen-*/lib/*.a ${libdir}/erlang/lib/erl_docgen-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-erl-docgen-dev="1" +DESCRIPTION:${PN}-erl-docgen-dev="" +RDEPENDS:${PN}-erl-docgen-dev="" +FILES:${PN}-erl-docgen-dev="${libdir}/erlang/lib/erl_docgen-*/src ${libdir}/erlang/lib/erl_docgen-*/include " + +ALLOW_EMPTY:${PN}-erl-docgen-dbg="1" +DESCRIPTION:${PN}-erl-docgen-dbg="" +RDEPENDS:${PN}-erl-docgen-dbg="" +FILES:${PN}-erl-docgen-dbg="${libdir}/erlang/lib/erl_docgen-*/bin/.debug ${libdir}/erlang/lib/erl_docgen-*/lib/.debug ${libdir}/erlang/lib/erl_docgen-*/priv/lib/.debug ${libdir}/erlang/lib/erl_docgen-*/priv/obj/.debug ${libdir}/erlang/lib/erl_docgen-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-erl-docgen="1" +DESCRIPTION:${PN}-erl-docgen="" +RDEPENDS:${PN}-erl-docgen="" +FILES:${PN}-erl-docgen="${libdir}/erlang/lib/erl_docgen-* " + +ALLOW_EMPTY:${PN}-eldap-staticdev="1" +DESCRIPTION:${PN}-eldap-staticdev="" +RDEPENDS:${PN}-eldap-staticdev="" +FILES:${PN}-eldap-staticdev="${libdir}/erlang/lib/eldap-*/lib/*.a ${libdir}/erlang/lib/eldap-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-eldap-dev="1" +DESCRIPTION:${PN}-eldap-dev="" +RDEPENDS:${PN}-eldap-dev="" +FILES:${PN}-eldap-dev="${libdir}/erlang/lib/eldap-*/src ${libdir}/erlang/lib/eldap-*/include " + +ALLOW_EMPTY:${PN}-eldap-dbg="1" +DESCRIPTION:${PN}-eldap-dbg="" +RDEPENDS:${PN}-eldap-dbg="" +FILES:${PN}-eldap-dbg="${libdir}/erlang/lib/eldap-*/bin/.debug ${libdir}/erlang/lib/eldap-*/lib/.debug ${libdir}/erlang/lib/eldap-*/priv/lib/.debug ${libdir}/erlang/lib/eldap-*/priv/obj/.debug ${libdir}/erlang/lib/eldap-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-eldap="1" +DESCRIPTION:${PN}-eldap="" +RDEPENDS:${PN}-eldap="" +FILES:${PN}-eldap="${libdir}/erlang/lib/eldap-* " + +ALLOW_EMPTY:${PN}-edoc-staticdev="1" +DESCRIPTION:${PN}-edoc-staticdev="" +RDEPENDS:${PN}-edoc-staticdev="" +FILES:${PN}-edoc-staticdev="${libdir}/erlang/lib/edoc-*/lib/*.a ${libdir}/erlang/lib/edoc-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-edoc-dev="1" +DESCRIPTION:${PN}-edoc-dev="" +RDEPENDS:${PN}-edoc-dev="" +FILES:${PN}-edoc-dev="${libdir}/erlang/lib/edoc-*/src ${libdir}/erlang/lib/edoc-*/include " + +ALLOW_EMPTY:${PN}-edoc-dbg="1" +DESCRIPTION:${PN}-edoc-dbg="" +RDEPENDS:${PN}-edoc-dbg="" +FILES:${PN}-edoc-dbg="${libdir}/erlang/lib/edoc-*/bin/.debug ${libdir}/erlang/lib/edoc-*/lib/.debug ${libdir}/erlang/lib/edoc-*/priv/lib/.debug ${libdir}/erlang/lib/edoc-*/priv/obj/.debug ${libdir}/erlang/lib/edoc-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-edoc="1" +DESCRIPTION:${PN}-edoc="" +RDEPENDS:${PN}-edoc="" +FILES:${PN}-edoc="${libdir}/erlang/lib/edoc-* " + +ALLOW_EMPTY:${PN}-doc="1" +DESCRIPTION:${PN}-doc="" +RDEPENDS:${PN}-doc="" +FILES:${PN}-doc+="${libdir}/erlang/erts-*/doc ${libdir}/erlang/erts-*/man ${libdir}/erlang/lib/*/examples ${libdir}/erlang/misc " + +ALLOW_EMPTY:${PN}-diameter-staticdev="1" +DESCRIPTION:${PN}-diameter-staticdev="" +RDEPENDS:${PN}-diameter-staticdev="" +FILES:${PN}-diameter-staticdev="${libdir}/erlang/lib/diameter-*/lib/*.a ${libdir}/erlang/lib/diameter-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-diameter-dev="1" +DESCRIPTION:${PN}-diameter-dev="" +RDEPENDS:${PN}-diameter-dev="" +FILES:${PN}-diameter-dev="${libdir}/erlang/lib/diameter-*/src ${libdir}/erlang/lib/diameter-*/include " + +ALLOW_EMPTY:${PN}-diameter-dbg="1" +DESCRIPTION:${PN}-diameter-dbg="" +RDEPENDS:${PN}-diameter-dbg="" +FILES:${PN}-diameter-dbg="${libdir}/erlang/lib/diameter-*/bin/.debug ${libdir}/erlang/lib/diameter-*/lib/.debug ${libdir}/erlang/lib/diameter-*/priv/lib/.debug ${libdir}/erlang/lib/diameter-*/priv/obj/.debug ${libdir}/erlang/lib/diameter-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-diameter="1" +DESCRIPTION:${PN}-diameter="" +RDEPENDS:${PN}-diameter="" +FILES:${PN}-diameter="${libdir}/erlang/lib/diameter-* " + +ALLOW_EMPTY:${PN}-dialyzer-staticdev="1" +DESCRIPTION:${PN}-dialyzer-staticdev="" +RDEPENDS:${PN}-dialyzer-staticdev="" +FILES:${PN}-dialyzer-staticdev="${libdir}/erlang/lib/dialyzer-*/lib/*.a ${libdir}/erlang/lib/dialyzer-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-dialyzer-dev="1" +DESCRIPTION:${PN}-dialyzer-dev="" +RDEPENDS:${PN}-dialyzer-dev="" +FILES:${PN}-dialyzer-dev="${libdir}/erlang/lib/dialyzer-*/src ${libdir}/erlang/lib/dialyzer-*/include " + +ALLOW_EMPTY:${PN}-dialyzer-dbg="1" +DESCRIPTION:${PN}-dialyzer-dbg="" +RDEPENDS:${PN}-dialyzer-dbg="" +FILES:${PN}-dialyzer-dbg="${libdir}/erlang/lib/dialyzer-*/bin/.debug ${libdir}/erlang/lib/dialyzer-*/lib/.debug ${libdir}/erlang/lib/dialyzer-*/priv/lib/.debug ${libdir}/erlang/lib/dialyzer-*/priv/obj/.debug ${libdir}/erlang/lib/dialyzer-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-dialyzer="1" +DESCRIPTION:${PN}-dialyzer="" +RDEPENDS:${PN}-dialyzer="" +FILES:${PN}-dialyzer="${libdir}/erlang/lib/dialyzer-* " + +ALLOW_EMPTY:${PN}-dev="1" +DESCRIPTION:${PN}-dev="" +RDEPENDS:${PN}-dev="" +FILES:${PN}-dev+="${libdir}/erlang/erts-*/include ${libdir}/erlang/erts-*/src ${libdir}/erlang/usr/include " + +ALLOW_EMPTY:${PN}-debugger-staticdev="1" +DESCRIPTION:${PN}-debugger-staticdev="" +RDEPENDS:${PN}-debugger-staticdev="" +FILES:${PN}-debugger-staticdev="${libdir}/erlang/lib/debugger-*/lib/*.a ${libdir}/erlang/lib/debugger-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-debugger-dev="1" +DESCRIPTION:${PN}-debugger-dev="" +RDEPENDS:${PN}-debugger-dev="" +FILES:${PN}-debugger-dev="${libdir}/erlang/lib/debugger-*/src ${libdir}/erlang/lib/debugger-*/include " + +ALLOW_EMPTY:${PN}-debugger-dbg="1" +DESCRIPTION:${PN}-debugger-dbg="" +RDEPENDS:${PN}-debugger-dbg="" +FILES:${PN}-debugger-dbg="${libdir}/erlang/lib/debugger-*/bin/.debug ${libdir}/erlang/lib/debugger-*/lib/.debug ${libdir}/erlang/lib/debugger-*/priv/lib/.debug ${libdir}/erlang/lib/debugger-*/priv/obj/.debug ${libdir}/erlang/lib/debugger-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-debugger="1" +DESCRIPTION:${PN}-debugger="" +RDEPENDS:${PN}-debugger="" +FILES:${PN}-debugger="${libdir}/erlang/lib/debugger-* " + +ALLOW_EMPTY:${PN}-dbg="1" +DESCRIPTION:${PN}-dbg="" +RDEPENDS:${PN}-dbg="" +FILES:${PN}-dbg+="${libdir}/erlang/bin/.debug ${libdir}/erlang/erts-*/bin/.debug " + +ALLOW_EMPTY:${PN}-crypto-staticdev="1" +DESCRIPTION:${PN}-crypto-staticdev="" +RDEPENDS:${PN}-crypto-staticdev="" +FILES:${PN}-crypto-staticdev="${libdir}/erlang/lib/crypto-*/lib/*.a ${libdir}/erlang/lib/crypto-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-crypto-dev="1" +DESCRIPTION:${PN}-crypto-dev="" +RDEPENDS:${PN}-crypto-dev="" +FILES:${PN}-crypto-dev="${libdir}/erlang/lib/crypto-*/src ${libdir}/erlang/lib/crypto-*/include " + +ALLOW_EMPTY:${PN}-crypto-dbg="1" +DESCRIPTION:${PN}-crypto-dbg="" +RDEPENDS:${PN}-crypto-dbg="" +FILES:${PN}-crypto-dbg="${libdir}/erlang/lib/crypto-*/bin/.debug ${libdir}/erlang/lib/crypto-*/lib/.debug ${libdir}/erlang/lib/crypto-*/priv/lib/.debug ${libdir}/erlang/lib/crypto-*/priv/obj/.debug ${libdir}/erlang/lib/crypto-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-crypto="1" +DESCRIPTION:${PN}-crypto="" +RDEPENDS:${PN}-crypto="" +FILES:${PN}-crypto="${libdir}/erlang/lib/crypto-* " + +ALLOW_EMPTY:${PN}-costransactions-staticdev="1" +DESCRIPTION:${PN}-costransactions-staticdev="" +RDEPENDS:${PN}-costransactions-staticdev="" +FILES:${PN}-costransactions-staticdev="${libdir}/erlang/lib/cosTransactions-*/lib/*.a ${libdir}/erlang/lib/cosTransactions-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-costransactions-dev="1" +DESCRIPTION:${PN}-costransactions-dev="" +RDEPENDS:${PN}-costransactions-dev="" +FILES:${PN}-costransactions-dev="${libdir}/erlang/lib/cosTransactions-*/src ${libdir}/erlang/lib/cosTransactions-*/include " + +ALLOW_EMPTY:${PN}-costransactions-dbg="1" +DESCRIPTION:${PN}-costransactions-dbg="" +RDEPENDS:${PN}-costransactions-dbg="" +FILES:${PN}-costransactions-dbg="${libdir}/erlang/lib/cosTransactions-*/bin/.debug ${libdir}/erlang/lib/cosTransactions-*/lib/.debug ${libdir}/erlang/lib/cosTransactions-*/priv/lib/.debug ${libdir}/erlang/lib/cosTransactions-*/priv/obj/.debug ${libdir}/erlang/lib/cosTransactions-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-costransactions="1" +DESCRIPTION:${PN}-costransactions="" +RDEPENDS:${PN}-costransactions="" +FILES:${PN}-costransactions="${libdir}/erlang/lib/cosTransactions-* " + +ALLOW_EMPTY:${PN}-costime-staticdev="1" +DESCRIPTION:${PN}-costime-staticdev="" +RDEPENDS:${PN}-costime-staticdev="" +FILES:${PN}-costime-staticdev="${libdir}/erlang/lib/cosTime-*/lib/*.a ${libdir}/erlang/lib/cosTime-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-costime-dev="1" +DESCRIPTION:${PN}-costime-dev="" +RDEPENDS:${PN}-costime-dev="" +FILES:${PN}-costime-dev="${libdir}/erlang/lib/cosTime-*/src ${libdir}/erlang/lib/cosTime-*/include " + +ALLOW_EMPTY:${PN}-costime-dbg="1" +DESCRIPTION:${PN}-costime-dbg="" +RDEPENDS:${PN}-costime-dbg="" +FILES:${PN}-costime-dbg="${libdir}/erlang/lib/cosTime-*/bin/.debug ${libdir}/erlang/lib/cosTime-*/lib/.debug ${libdir}/erlang/lib/cosTime-*/priv/lib/.debug ${libdir}/erlang/lib/cosTime-*/priv/obj/.debug ${libdir}/erlang/lib/cosTime-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-costime="1" +DESCRIPTION:${PN}-costime="" +RDEPENDS:${PN}-costime="" +FILES:${PN}-costime="${libdir}/erlang/lib/cosTime-* " + +ALLOW_EMPTY:${PN}-cosproperty-staticdev="1" +DESCRIPTION:${PN}-cosproperty-staticdev="" +RDEPENDS:${PN}-cosproperty-staticdev="" +FILES:${PN}-cosproperty-staticdev="${libdir}/erlang/lib/cosProperty-*/lib/*.a ${libdir}/erlang/lib/cosProperty-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-cosproperty-dev="1" +DESCRIPTION:${PN}-cosproperty-dev="" +RDEPENDS:${PN}-cosproperty-dev="" +FILES:${PN}-cosproperty-dev="${libdir}/erlang/lib/cosProperty-*/src ${libdir}/erlang/lib/cosProperty-*/include " + +ALLOW_EMPTY:${PN}-cosproperty-dbg="1" +DESCRIPTION:${PN}-cosproperty-dbg="" +RDEPENDS:${PN}-cosproperty-dbg="" +FILES:${PN}-cosproperty-dbg="${libdir}/erlang/lib/cosProperty-*/bin/.debug ${libdir}/erlang/lib/cosProperty-*/lib/.debug ${libdir}/erlang/lib/cosProperty-*/priv/lib/.debug ${libdir}/erlang/lib/cosProperty-*/priv/obj/.debug ${libdir}/erlang/lib/cosProperty-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-cosproperty="1" +DESCRIPTION:${PN}-cosproperty="" +RDEPENDS:${PN}-cosproperty="" +FILES:${PN}-cosproperty="${libdir}/erlang/lib/cosProperty-* " + +ALLOW_EMPTY:${PN}-cosnotification-staticdev="1" +DESCRIPTION:${PN}-cosnotification-staticdev="" +RDEPENDS:${PN}-cosnotification-staticdev="" +FILES:${PN}-cosnotification-staticdev="${libdir}/erlang/lib/cosNotification-*/lib/*.a ${libdir}/erlang/lib/cosNotification-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-cosnotification-dev="1" +DESCRIPTION:${PN}-cosnotification-dev="" +RDEPENDS:${PN}-cosnotification-dev="" +FILES:${PN}-cosnotification-dev="${libdir}/erlang/lib/cosNotification-*/src ${libdir}/erlang/lib/cosNotification-*/include " + +ALLOW_EMPTY:${PN}-cosnotification-dbg="1" +DESCRIPTION:${PN}-cosnotification-dbg="" +RDEPENDS:${PN}-cosnotification-dbg="" +FILES:${PN}-cosnotification-dbg="${libdir}/erlang/lib/cosNotification-*/bin/.debug ${libdir}/erlang/lib/cosNotification-*/lib/.debug ${libdir}/erlang/lib/cosNotification-*/priv/lib/.debug ${libdir}/erlang/lib/cosNotification-*/priv/obj/.debug ${libdir}/erlang/lib/cosNotification-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-cosnotification="1" +DESCRIPTION:${PN}-cosnotification="" +RDEPENDS:${PN}-cosnotification="" +FILES:${PN}-cosnotification="${libdir}/erlang/lib/cosNotification-* " + +ALLOW_EMPTY:${PN}-cosfiletransfer-staticdev="1" +DESCRIPTION:${PN}-cosfiletransfer-staticdev="" +RDEPENDS:${PN}-cosfiletransfer-staticdev="" +FILES:${PN}-cosfiletransfer-staticdev="${libdir}/erlang/lib/cosFileTransfer-*/lib/*.a ${libdir}/erlang/lib/cosFileTransfer-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-cosfiletransfer-dev="1" +DESCRIPTION:${PN}-cosfiletransfer-dev="" +RDEPENDS:${PN}-cosfiletransfer-dev="" +FILES:${PN}-cosfiletransfer-dev="${libdir}/erlang/lib/cosFileTransfer-*/src ${libdir}/erlang/lib/cosFileTransfer-*/include " + +ALLOW_EMPTY:${PN}-cosfiletransfer-dbg="1" +DESCRIPTION:${PN}-cosfiletransfer-dbg="" +RDEPENDS:${PN}-cosfiletransfer-dbg="" +FILES:${PN}-cosfiletransfer-dbg="${libdir}/erlang/lib/cosFileTransfer-*/bin/.debug ${libdir}/erlang/lib/cosFileTransfer-*/lib/.debug ${libdir}/erlang/lib/cosFileTransfer-*/priv/lib/.debug ${libdir}/erlang/lib/cosFileTransfer-*/priv/obj/.debug ${libdir}/erlang/lib/cosFileTransfer-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-cosfiletransfer="1" +DESCRIPTION:${PN}-cosfiletransfer="" +RDEPENDS:${PN}-cosfiletransfer="" +FILES:${PN}-cosfiletransfer="${libdir}/erlang/lib/cosFileTransfer-* " + +ALLOW_EMPTY:${PN}-coseventdomain-staticdev="1" +DESCRIPTION:${PN}-coseventdomain-staticdev="" +RDEPENDS:${PN}-coseventdomain-staticdev="" +FILES:${PN}-coseventdomain-staticdev="${libdir}/erlang/lib/cosEventDomain-*/lib/*.a ${libdir}/erlang/lib/cosEventDomain-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-coseventdomain-dev="1" +DESCRIPTION:${PN}-coseventdomain-dev="" +RDEPENDS:${PN}-coseventdomain-dev="" +FILES:${PN}-coseventdomain-dev="${libdir}/erlang/lib/cosEventDomain-*/src ${libdir}/erlang/lib/cosEventDomain-*/include " + +ALLOW_EMPTY:${PN}-coseventdomain-dbg="1" +DESCRIPTION:${PN}-coseventdomain-dbg="" +RDEPENDS:${PN}-coseventdomain-dbg="" +FILES:${PN}-coseventdomain-dbg="${libdir}/erlang/lib/cosEventDomain-*/bin/.debug ${libdir}/erlang/lib/cosEventDomain-*/lib/.debug ${libdir}/erlang/lib/cosEventDomain-*/priv/lib/.debug ${libdir}/erlang/lib/cosEventDomain-*/priv/obj/.debug ${libdir}/erlang/lib/cosEventDomain-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-coseventdomain="1" +DESCRIPTION:${PN}-coseventdomain="" +RDEPENDS:${PN}-coseventdomain="" +FILES:${PN}-coseventdomain="${libdir}/erlang/lib/cosEventDomain-* " + +ALLOW_EMPTY:${PN}-cosevent-staticdev="1" +DESCRIPTION:${PN}-cosevent-staticdev="" +RDEPENDS:${PN}-cosevent-staticdev="" +FILES:${PN}-cosevent-staticdev="${libdir}/erlang/lib/cosEvent-*/lib/*.a ${libdir}/erlang/lib/cosEvent-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-cosevent-dev="1" +DESCRIPTION:${PN}-cosevent-dev="" +RDEPENDS:${PN}-cosevent-dev="" +FILES:${PN}-cosevent-dev="${libdir}/erlang/lib/cosEvent-*/src ${libdir}/erlang/lib/cosEvent-*/include " + +ALLOW_EMPTY:${PN}-cosevent-dbg="1" +DESCRIPTION:${PN}-cosevent-dbg="" +RDEPENDS:${PN}-cosevent-dbg="" +FILES:${PN}-cosevent-dbg="${libdir}/erlang/lib/cosEvent-*/bin/.debug ${libdir}/erlang/lib/cosEvent-*/lib/.debug ${libdir}/erlang/lib/cosEvent-*/priv/lib/.debug ${libdir}/erlang/lib/cosEvent-*/priv/obj/.debug ${libdir}/erlang/lib/cosEvent-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-cosevent="1" +DESCRIPTION:${PN}-cosevent="" +RDEPENDS:${PN}-cosevent="" +FILES:${PN}-cosevent="${libdir}/erlang/lib/cosEvent-* " + +ALLOW_EMPTY:${PN}-compiler-staticdev="1" +DESCRIPTION:${PN}-compiler-staticdev="" +RDEPENDS:${PN}-compiler-staticdev="" +FILES:${PN}-compiler-staticdev="${libdir}/erlang/lib/compiler-*/lib/*.a ${libdir}/erlang/lib/compiler-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-compiler-dev="1" +DESCRIPTION:${PN}-compiler-dev="" +RDEPENDS:${PN}-compiler-dev="" +FILES:${PN}-compiler-dev="${libdir}/erlang/lib/compiler-*/src ${libdir}/erlang/lib/compiler-*/include " + +ALLOW_EMPTY:${PN}-compiler-dbg="1" +DESCRIPTION:${PN}-compiler-dbg="" +RDEPENDS:${PN}-compiler-dbg="" +FILES:${PN}-compiler-dbg="${libdir}/erlang/lib/compiler-*/bin/.debug ${libdir}/erlang/lib/compiler-*/lib/.debug ${libdir}/erlang/lib/compiler-*/priv/lib/.debug ${libdir}/erlang/lib/compiler-*/priv/obj/.debug ${libdir}/erlang/lib/compiler-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-compiler="1" +DESCRIPTION:${PN}-compiler="" +RDEPENDS:${PN}-compiler="" +FILES:${PN}-compiler="${libdir}/erlang/lib/compiler-* " + +ALLOW_EMPTY:${PN}-common-test-staticdev="1" +DESCRIPTION:${PN}-common-test-staticdev="" +RDEPENDS:${PN}-common-test-staticdev="" +FILES:${PN}-common-test-staticdev="${libdir}/erlang/lib/common_test-*/lib/*.a ${libdir}/erlang/lib/common_test-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-common-test-dev="1" +DESCRIPTION:${PN}-common-test-dev="" +RDEPENDS:${PN}-common-test-dev="" +FILES:${PN}-common-test-dev="${libdir}/erlang/lib/common_test-*/src ${libdir}/erlang/lib/common_test-*/include " + +ALLOW_EMPTY:${PN}-common-test-dbg="1" +DESCRIPTION:${PN}-common-test-dbg="" +RDEPENDS:${PN}-common-test-dbg="" +FILES:${PN}-common-test-dbg="${libdir}/erlang/lib/common_test-*/bin/.debug ${libdir}/erlang/lib/common_test-*/lib/.debug ${libdir}/erlang/lib/common_test-*/priv/lib/.debug ${libdir}/erlang/lib/common_test-*/priv/obj/.debug ${libdir}/erlang/lib/common_test-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-common-test="1" +DESCRIPTION:${PN}-common-test="" +RDEPENDS:${PN}-common-test="" +FILES:${PN}-common-test="${libdir}/erlang/lib/common_test-* " + +ALLOW_EMPTY:${PN}-asn1-staticdev="1" +DESCRIPTION:${PN}-asn1-staticdev="" +RDEPENDS:${PN}-asn1-staticdev="" +FILES:${PN}-asn1-staticdev="${libdir}/erlang/lib/asn1-*/lib/*.a ${libdir}/erlang/lib/asn1-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-asn1-dev="1" +DESCRIPTION:${PN}-asn1-dev="" +RDEPENDS:${PN}-asn1-dev="" +FILES:${PN}-asn1-dev="${libdir}/erlang/lib/asn1-*/src ${libdir}/erlang/lib/asn1-*/include " + +ALLOW_EMPTY:${PN}-asn1-dbg="1" +DESCRIPTION:${PN}-asn1-dbg="" +RDEPENDS:${PN}-asn1-dbg="" +FILES:${PN}-asn1-dbg="${libdir}/erlang/lib/asn1-*/bin/.debug ${libdir}/erlang/lib/asn1-*/lib/.debug ${libdir}/erlang/lib/asn1-*/priv/lib/.debug ${libdir}/erlang/lib/asn1-*/priv/obj/.debug ${libdir}/erlang/lib/asn1-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-asn1="1" +DESCRIPTION:${PN}-asn1="" +RDEPENDS:${PN}-asn1="" +FILES:${PN}-asn1="${libdir}/erlang/lib/asn1-* " + +ALLOW_EMPTY:${PN}-appmon-staticdev="1" +DESCRIPTION:${PN}-appmon-staticdev="" +RDEPENDS:${PN}-appmon-staticdev="" +FILES:${PN}-appmon-staticdev="${libdir}/erlang/lib/appmon-*/lib/*.a ${libdir}/erlang/lib/appmon-*/priv/lib/*.a " + +ALLOW_EMPTY:${PN}-appmon-dev="1" +DESCRIPTION:${PN}-appmon-dev="" +RDEPENDS:${PN}-appmon-dev="" +FILES:${PN}-appmon-dev="${libdir}/erlang/lib/appmon-*/src ${libdir}/erlang/lib/appmon-*/include " + +ALLOW_EMPTY:${PN}-appmon-dbg="1" +DESCRIPTION:${PN}-appmon-dbg="" +RDEPENDS:${PN}-appmon-dbg="" +FILES:${PN}-appmon-dbg="${libdir}/erlang/lib/appmon-*/bin/.debug ${libdir}/erlang/lib/appmon-*/lib/.debug ${libdir}/erlang/lib/appmon-*/priv/lib/.debug ${libdir}/erlang/lib/appmon-*/priv/obj/.debug ${libdir}/erlang/lib/appmon-*/priv/bin/.debug " + +ALLOW_EMPTY:${PN}-appmon="1" +DESCRIPTION:${PN}-appmon="" +RDEPENDS:${PN}-appmon="" +FILES:${PN}-appmon="${libdir}/erlang/lib/appmon-* " + +ALLOW_EMPTY:${PN}="1" +DESCRIPTION:${PN}="" +RDEPENDS:${PN}="${PN}-erts ${PN}-kernel ${PN}-sasl ${PN}-stdlib" +FILES:${PN}+="${bindir} ${libdir}/erlang/releases ${libdir}/erlang/bin ${libdir}/erlang/erts-*/bin " + +DESCRIPTION:${PN}-modules="All Erlang modules" +RDEPENDS:${PN}-modules="${PN} ${PN}-appmon ${PN}-asn1 ${PN}-common-test ${PN}-compiler ${PN}-cosevent ${PN}-coseventdomain ${PN}-cosfiletransfer ${PN}-cosnotification ${PN}-cosproperty ${PN}-costime ${PN}-costransactions ${PN}-crypto ${PN}-debugger ${PN}-dialyzer ${PN}-diameter ${PN}-doc ${PN}-edoc ${PN}-eldap ${PN}-erl-docgen ${PN}-erl-interface ${PN}-erts ${PN}-et ${PN}-eunit ${PN}-gs ${PN}-hipe ${PN}-ic ${PN}-inets ${PN}-jinterface ${PN}-kernel ${PN}-kernel-doc ${PN}-megaco ${PN}-mnesia ${PN}-observer ${PN}-orber ${PN}-os-mon ${PN}-otp-mibs ${PN}-parsetools ${PN}-percept ${PN}-pman ${PN}-public-key ${PN}-reltool ${PN}-runtime-tools ${PN}-sasl ${PN}-sasl-doc ${PN}-snmp ${PN}-ssh ${PN}-ssl ${PN}-stdlib ${PN}-stdlib-doc ${PN}-syntax-tools ${PN}-test-server ${PN}-toolbar ${PN}-tools ${PN}-tv ${PN}-typer ${PN}-webtool ${PN}-xmerl " +ALLOW_EMPTY:${PN}-modules = "1" diff --git a/meta-openstack/recipes-devtools/erlang/erlang-native_R15B.bb b/meta-openstack/recipes-devtools/erlang/erlang-native_R15B.bb index 435795fd..f4cad839 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang-native_R15B.bb +++ b/meta-openstack/recipes-devtools/erlang/erlang-native_R15B.bb @@ -16,11 +16,11 @@ do_configure() { oe_runconf } -do_compile_prepend() { +do_compile:prepend() { export TARGET=${HOST_SYS} } -do_install_prepend() { +do_install:prepend() { export TARGET=${HOST_SYS} } diff --git a/meta-openstack/recipes-devtools/erlang/erlang-native_R16B03-1.bb b/meta-openstack/recipes-devtools/erlang/erlang-native_R16B03-1.bb index 61fc027d..6f3ca463 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang-native_R16B03-1.bb +++ b/meta-openstack/recipes-devtools/erlang/erlang-native_R16B03-1.bb @@ -13,11 +13,11 @@ do_configure() { oe_runconf } -do_compile_prepend() { +do_compile:prepend() { export TARGET=${HOST_SYS} } -do_install_prepend() { +do_install:prepend() { export TARGET=${HOST_SYS} } diff --git a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb index 68d144b1..6f54747f 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb +++ b/meta-openstack/recipes-devtools/erlang/erlang_R15B.bb @@ -9,11 +9,11 @@ EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'" EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}" -EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_mipsel = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_sh3 = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_sh4 = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:arm = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:armeb = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:mipsel = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append_sh3 = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:sh4 = " --disable-smp-support --disable-hipe" NATIVE_BIN = "${TMPDIR}/work/erlang-native-${PV}-${PR}/otp_src_${UPSTREAM_VERSION}/bin" @@ -51,9 +51,9 @@ do_install() { PACKAGES =+ "${PN}-libs-dbg ${PN}-libs" -FILES_${PN}-staticdev += "${libdir}/*/*/*/*.a ${libdir}/*/*/*/*/*.a ${libdir}/*/*/*/*/*/*.a " +FILES:${PN}-staticdev += "${libdir}/*/*/*/*.a ${libdir}/*/*/*/*/*.a ${libdir}/*/*/*/*/*/*.a " -FILES_${PN}-libs-dbg += " ${libdir}/erlang/*/.debug ${libdir}/erlang/*/*/.debug ${libdir}/erlang/*/*/*/.debug ${libdir}/erlang/*/*/*/*/.debug ${libdir}/erlang/*/*/*/*/*/.debug " +FILES:${PN}-libs-dbg += " ${libdir}/erlang/*/.debug ${libdir}/erlang/*/*/.debug ${libdir}/erlang/*/*/*/.debug ${libdir}/erlang/*/*/*/*/.debug ${libdir}/erlang/*/*/*/*/*/.debug " SRC_URI[md5sum] = "dd6c2a4807551b4a8a536067bde31d73" SRC_URI[sha256sum] = "5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2" diff --git a/meta-openstack/recipes-devtools/erlang/erlang_R16B03-1.bb b/meta-openstack/recipes-devtools/erlang/erlang_R16B03-1.bb index 4c2b947f..573c5ee0 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang_R16B03-1.bb +++ b/meta-openstack/recipes-devtools/erlang/erlang_R16B03-1.bb @@ -9,11 +9,11 @@ TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'" -EXTRA_OECONF_append_arm = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_armeb = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_mipsel = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_sh3 = " --disable-smp-support --disable-hipe" -EXTRA_OECONF_append_sh4 = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:arm = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:armeb = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:mipsel = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append_sh3 = " --disable-smp-support --disable-hipe" +EXTRA_OECONF:append:sh4 = " --disable-smp-support --disable-hipe" NATIVE_BIN = "${STAGING_LIBDIR_NATIVE}/erlang/bin" diff --git a/meta-openstack/recipes-devtools/erlang/nativesdk-erlang_R16B03-1.bb b/meta-openstack/recipes-devtools/erlang/nativesdk-erlang_R16B03-1.bb index 7196fc69..2ca2574a 100644 --- a/meta-openstack/recipes-devtools/erlang/nativesdk-erlang_R16B03-1.bb +++ b/meta-openstack/recipes-devtools/erlang/nativesdk-erlang_R16B03-1.bb @@ -6,7 +6,7 @@ require erlang-${PV}-manifest.inc DEPENDS = "erlang-native openssl ncurses" -RDEPENDS_${PN} = "nativesdk-ncurses nativesdk-erlang-modules" +RDEPENDS:${PN} = "nativesdk-ncurses nativesdk-erlang-modules" PR = "r0" @@ -21,15 +21,15 @@ do_configure() { oe_runconf } -do_compile_prepend() { +do_compile:prepend() { export TARGET=${HOST_SYS} } -do_install_prepend() { +do_install:prepend() { export TARGET=${HOST_SYS} } -do_install_append() { +do_install:append() { rm -f ${D}/${libdir}/erlang/Install } diff --git a/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb b/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb index ec84c44a..51ce60ca 100644 --- a/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb +++ b/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Config file parser module" HOMEPAGE = "http://search.cpan.org/dist/Config-General/" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" SECTION = "libs" LIC_FILES_CHKSUM = "file://README;beginline=90;endline=90;md5=3ba4bbac1e79a08332688196f637d2b2" diff --git a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb index bb422987..56eb126c 100644 --- a/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb +++ b/meta-openstack/recipes-devtools/python/python-aioeventlet_0.4.bb @@ -17,7 +17,7 @@ DEPENDS += " \ python-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-sphinx \ " diff --git a/meta-openstack/recipes-devtools/python/python-amqplib.inc b/meta-openstack/recipes-devtools/python/python-amqplib.inc deleted file mode 100644 index d9f22cb8..00000000 --- a/meta-openstack/recipes-devtools/python/python-amqplib.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Python client for the Advanced Message Queuing Procotol (AMQP)" -HOMEPAGE = "http://code.google.com/p/py-amqplib/" -SECTION = "devel/python" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1702a92c723f09e3fab3583b165a8d90" - -PR = "r1" -SRCNAME = "amqplib" - -SRC_URI = "https://github.com/barryp/py-amqplib/archive/${PV}.tar.gz" - -SRC_URI[md5sum] = "ff405a7b57aa98cdf07d02bd8090fa29" -SRC_URI[sha256sum] = "9461d73f75ca704e6b656738b5dad42a1948e61dfbc8233077d84d00f74c3936" - -S = "${WORKDIR}/py-amqplib-${PV}" - diff --git a/meta-openstack/recipes-devtools/python/python-arrow.inc b/meta-openstack/recipes-devtools/python/python-arrow.inc deleted file mode 100644 index 9556a6d5..00000000 --- a/meta-openstack/recipes-devtools/python/python-arrow.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Better dates and times for Python" -HOMEPAGE = "https://github.com/crsmithdev/arrow" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=458d41a4064e4dc109666cfd941a29e4" - -SRC_URI[md5sum] = "554f18b0e23182ee0e8cb2a882d2f607" -SRC_URI[sha256sum] = "10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-backports-functools-lru-cache \ - " diff --git a/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb b/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb deleted file mode 100644 index 3cfd3fd3..00000000 --- a/meta-openstack/recipes-devtools/python/python-automaton_0.8.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Friendly state machines for python" -HOMEPAGE = "https://pypi.python.org/pypi/automaton" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" - -SRC_URI[md5sum] = "230a7bd8bb9a4bc9ba5a3faf0de12c90" -SRC_URI[sha256sum] = "ca8bfbea03b9f39a536b4b261d90fbe8b1b0e1766bff5d8222e35691f8e11910" - -inherit setuptools3 pypi - -DEPENDS += " \ - python-pip \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - python-debtcollector \ - python-prettytable \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-avahi.inc b/meta-openstack/recipes-devtools/python/python-avahi.inc deleted file mode 100644 index c2359596..00000000 --- a/meta-openstack/recipes-devtools/python/python-avahi.inc +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Python bindings for the avahi zeroconf client" -HOMEPAGE = "https://github.com/lathiat/avahi" -SECTION = "devel/python" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz" - -SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" -SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" - -S = "${WORKDIR}/avahi-${PV}" - -inherit python3native - -# we only need the python bindings -do_install () { - install -d ${D}${PYTHON_SITEPACKAGES_DIR}/avahi - - sed -i'' -e "s,@PYTHON\@,${bindir}/${PYTHON_PN},g" \ - ${S}/avahi-python/avahi/__init__.py \ - ${S}/avahi-python/avahi-bookmarks.in - - install -m 0775 ${S}/avahi-python/avahi/__init__.py \ - ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/__init__.py - - install -m 0775 ${S}/avahi-python/avahi-bookmarks.in \ - ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/avahi-bookmarks -} - -FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/avahi" diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 71cf4c33..c71229d4 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb @@ -8,7 +8,7 @@ PR = "r0" SRCNAME = "barbican" BARBICAN_MAX_PACKET_SIZE ?= "65535" -SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ +SRC_URI = "git://github.com/openstack/barbican.git;branch=master;protocol=https \ file://barbican.init \ file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \ file://barbican-fix-path-to-find-configuration-files.patch \ @@ -40,7 +40,7 @@ python () { } SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} BARBICAN_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -67,24 +67,24 @@ do_install_append() { } USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system barbican" -USERADD_PARAM_${PN} = "--system --home /var/lib/barbican -g barbican \ +GROUPADD_PARAM:${PN} = "--system barbican" +USERADD_PARAM:${PN} = "--system --home /var/lib/barbican -g barbican \ --no-create-home --shell /bin/false barbican" PACKAGES += "${SRCNAME} \ ${SRCNAME}-setup " -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ " -FILES_${SRCNAME} = "${sysconfdir}/${SRCNAME}/* \ +FILES:${SRCNAME} = "${sysconfdir}/${SRCNAME}/* \ ${sysconfdir}/init.d/barbican-api \ ${bindir} \ ${bindir}/* \ ${localstatedir}/* \ " -ALLOW_EMPTY_${SRCNAME}-setup = "1" -pkg_postinst_${SRCNAME}-setup () { +ALLOW_EMPTY:${SRCNAME}-setup = "1" +pkg_postinst:${SRCNAME}-setup () { if [ -z "$D" ]; then chown -R barbican:barbican ${sysconfdir}/${SRCNAME} chown -R barbican:barbican ${localstatedir}/lib/barbican @@ -96,13 +96,18 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${SRCNAME} = "${PN} \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${SRCNAME} = "${PN} \ ${SRCNAME}-setup \ uwsgi \ python-falcon \ python-oslo.messaging" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-pip \ python-pbr \ python-alembic \ @@ -126,8 +131,8 @@ RDEPENDS_${PN} += " \ " INITSCRIPT_PACKAGES = "${SRCNAME}" -INITSCRIPT_NAME_${SRCNAME} = "barbican-api" -INITSCRIPT_PARAMS_${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME} = "barbican-api" +INITSCRIPT_PARAMS:${SRCNAME} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "barbican" diff --git a/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb deleted file mode 100644 index 289495af..00000000 --- a/meta-openstack/recipes-devtools/python/python-barbicanclient_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Client library for Barbican API" -HOMEPAGE = "https://github.com/stackforge/python-barbicanclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e031cff4528978748f9cc064c6e6fa73" - -SRC_URI = "\ - git://github.com/openstack/python-barbicanclient.git \ - " - -PV = "4.9.0+git${SRCPV}" -SRCREV = "9c0e02d367b86eb5bdebda4e0ff1434d70db5f61" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-requests \ - python-six \ - python-cliff \ - python-keystoneauth1 \ - python-oslo.i18n \ - python-oslo.serialization \ - python-oslo.utils \ - " diff --git a/meta-openstack/recipes-devtools/python/python-boto_git.bb b/meta-openstack/recipes-devtools/python/python-boto_git.bb deleted file mode 100644 index 77e2043c..00000000 --- a/meta-openstack/recipes-devtools/python/python-boto_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Amazon Web Services API" -HOMEPAGE = "https://github.com/boto/boto" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=348302dddd421665d3c9b636a2e55832" - -SRCREV = "b5852b0aa5ac91f462b28ac9decee33d872dec4d" -PV = "2.8.0+git${SRCPV}" -PR = "r0" -SRCNAME = "boto" - -SRC_URI = "git://github.com/boto/boto.git;protocol=git" - -SRC_URI[md5sum] = "5528f3010c42dd0ed7b188a6917295f1" -SRC_URI[sha256sum] = "4d6d38aa8e9e536a27a9737eb4222f896417841fed9a12eedcb619ba8fb68a39" - -S = "${WORKDIR}/git" - -inherit setuptools3 - diff --git a/meta-openstack/recipes-devtools/python/python-castellan_git.bb b/meta-openstack/recipes-devtools/python/python-castellan_git.bb deleted file mode 100644 index a0017af3..00000000 --- a/meta-openstack/recipes-devtools/python/python-castellan_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Generic Key Manager interface for OpenStack" -HOMEPAGE = "https://github.com/openstack/castellan" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRCNAME = "castellan" - -SRC_URI = "\ - git://git.openstack.org/openstack/${SRCNAME}.git;branch=stable/pike \ - " - -PV="0.12.1+git${SRCPV}" -SRCREV="124e9296fe79412b510c73b35936a6be91267d18" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-babel \ - python-cryptography \ - python-barbicanclient \ - python-oslo.config \ - python-oslo.context \ - python-oslo.i18n \ - python-oslo.log \ - python-oslo.utils \ - python-keystoneauth1 \ - " diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 90cfe1ef..ca5d62f3 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "ceilometer" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://ceilometer.conf \ file://ceilometer.init \ file://fix_ceilometer_memory_leak.patch \ @@ -47,13 +47,13 @@ python () { d.setVarFlags("USERCREATE_PARAM_%s-reseller" % d.getVar('SRCNAME',True), flags) } -do_configure_append() { +do_configure:append() { # We are using postgresql support, hence this requirement is not valid # removing it, to avoid on-target runtime issues sed -e "s:MySQL-python::g" -i ${S}/requirements.txt } -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} CEILOMETER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -107,7 +107,7 @@ do_install_append() { fi } -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 @@ -131,44 +131,44 @@ PACKAGES += "${SRCNAME}-agent-notification" PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" PACKAGES += " ${SRCNAME}-reseller" -RDEPENDS_${SRCNAME}-tests += " bash" +RDEPENDS:${SRCNAME}-tests += " bash" -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-reseller = "1" -ALLOW_EMPTY_${SRCNAME}-tests = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-reseller = "1" +ALLOW_EMPTY:${SRCNAME}-tests = "1" -FILES_${PN} = "${libdir}/*" +FILES:${PN} = "${libdir}/*" -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/setup-test-env.sh" +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/setup-test-env.sh" -FILES_${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \ +FILES:${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \ " -FILES_${SRCNAME}-api = "${bindir}/ceilometer-api \ +FILES:${SRCNAME}-api = "${bindir}/ceilometer-api \ ${sysconfdir}/init.d/ceilometer-api \ " -FILES_${SRCNAME}-collector = "${bindir}/ceilometer-collector \ +FILES:${SRCNAME}-collector = "${bindir}/ceilometer-collector \ ${bindir}/ceilometer-collector-udp \ ${sysconfdir}/init.d/ceilometer-collector \ " -FILES_${SRCNAME}-alarm-evaluator = "${bindir}/ceilometer-alarm-evaluator \ +FILES:${SRCNAME}-alarm-evaluator = "${bindir}/ceilometer-alarm-evaluator \ ${sysconfdir}/init.d/ceilometer-alarm-evaluator \ " -FILES_${SRCNAME}-alarm-notifier = "${bindir}/ceilometer-alarm-notifier \ +FILES:${SRCNAME}-alarm-notifier = "${bindir}/ceilometer-alarm-notifier \ ${sysconfdir}/init.d/ceilometer-alarm-notifier \ " -FILES_${SRCNAME}-agent-notification = "${bindir}/ceilometer-agent-notification \ +FILES:${SRCNAME}-agent-notification = "${bindir}/ceilometer-agent-notification \ ${sysconfdir}/init.d/ceilometer-agent-notification \ " -FILES_${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \ +FILES:${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \ ${sysconfdir}/init.d/ceilometer-agent-compute \ " -FILES_${SRCNAME}-controller = "${bindir}/* \ +FILES:${SRCNAME}-controller = "${bindir}/* \ ${localstatedir}/* \ ${sysconfdir}/init.d/ceilometer-agent-central \ " @@ -178,7 +178,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-ply \ python-jsonpath-rw \ python-sqlalchemy \ @@ -253,30 +258,30 @@ RDEPENDS_${PN} += " \ python-tooz \ " -RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification ${SRCNAME}-reseller \ +RDEPENDS:${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification ${SRCNAME}-reseller \ postgresql postgresql-client python-psycopg2 tgt" -RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller" -RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller" -RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient libvirt" -RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller" -RDEPENDS_${SRCNAME}-reseller = "postgresql sudo ${SRCNAME}-controller" +RDEPENDS:${SRCNAME}-api = "${SRCNAME}-controller" +RDEPENDS:${SRCNAME}-collector = "${SRCNAME}-controller" +RDEPENDS:${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient libvirt" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller" +RDEPENDS:${SRCNAME}-reseller = "postgresql sudo ${SRCNAME}-controller" INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification" -INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" -INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-collector = "${SRCNAME}-collector" -INITSCRIPT_PARAMS_${SRCNAME}-collector = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-compute = "${SRCNAME}-agent-compute" -INITSCRIPT_PARAMS_${SRCNAME}-compute = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-controller = "${SRCNAME}-agent-central" -INITSCRIPT_PARAMS_${SRCNAME}-controller = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier" -INITSCRIPT_PARAMS_${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator" -INITSCRIPT_PARAMS_${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-agent-notification = "${SRCNAME}-agent-notification" -INITSCRIPT_PARAMS_${SRCNAME}-agent-notification = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api" +INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-collector = "${SRCNAME}-collector" +INITSCRIPT_PARAMS:${SRCNAME}-collector = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-compute = "${SRCNAME}-agent-compute" +INITSCRIPT_PARAMS:${SRCNAME}-compute = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-controller = "${SRCNAME}-agent-central" +INITSCRIPT_PARAMS:${SRCNAME}-controller = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier" +INITSCRIPT_PARAMS:${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator" +INITSCRIPT_PARAMS:${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-agent-notification = "${SRCNAME}-agent-notification" +INITSCRIPT_PARAMS:${SRCNAME}-agent-notification = "${OS_DEFAULT_INITSCRIPT_PARAMS}" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "ceilometer" diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb deleted file mode 100644 index 5e5e43e2..00000000 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "CLI and python client library for OpenStack Ceilometer" -HOMEPAGE = "https://launchpad.net/ceilometer" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-iso8601 \ - python-keystoneauth1 \ - python-oslo.i18n \ - python-oslo.serialization \ - python-oslo.utils \ - python-prettytable \ - python-requests \ - python-six \ - python-stevedore \ - bash \ - " - -SRC_URI = "\ - git://github.com/openstack/python-ceilometerclient.git;branch=stable/pike \ - " - -PV = "2.9.1" -SRCREV = "4ee321feeef39fa2a297ad8e58e931b8a03d8f14" -S = "${WORKDIR}/git" - -inherit setuptools3 rmargparse - - -PACKAGECONFIG ?= "bash-completion" -PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" - -do_install_append() { - install -d ${D}/${sysconfdir}/bash_completion.d - install -m 664 ${S}/tools/ceilometer.bash_completion ${D}/${sysconfdir}/bash_completion.d -} - -PACKAGES =+ "${BPN}-bash-completion" -FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" diff --git a/meta-openstack/recipes-devtools/python/python-cephclient.inc b/meta-openstack/recipes-devtools/python/python-cephclient.inc deleted file mode 100644 index e8e0d0a9..00000000 --- a/meta-openstack/recipes-devtools/python/python-cephclient.inc +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A client library in python for the Ceph REST API." -HOMEPAGE = "https://github.com/dmsimard/python-cephclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" - -PYPI_PACKAGE = "python-cephclient" -PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-v${PV}.tar.gz" - -SRC_URI[md5sum] = "e3746607f1af1573a241b4995c10c938" -SRC_URI[sha256sum] = "9776b786da2aebdc0439ea2f809cc8923f52bc0cf610f77a9c1348466961134b" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-cython \ - " diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 29d35940..2a3ef47b 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "cinder" -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://cinder-init \ file://cinder-init.service \ file://cinder-api.service \ @@ -31,8 +31,8 @@ USER = "cinder" GROUP = "cinder" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${GROUP}" -USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}" +GROUPADD_PARAM:${PN} = "--system ${GROUP}" +USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}" CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" @@ -44,7 +44,7 @@ CINDER_NFS_VOLUME_SERVERS ?= "${CINDER_NFS_VOLUME_SERVERS_DEFAULT}" CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT = "controller:/glusterfs_volumes" CINDER_GLUSTERFS_VOLUME_SERVERS ?= "${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}" -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -160,35 +160,35 @@ do_install_append() { #} PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup" -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-backup = "1" -ALLOW_EMPTY_${SRCNAME}-scheduler = "1" -ALLOW_EMPTY_${SRCNAME}-volume = "1" -ALLOW_EMPTY_${SRCNAME}-api = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-backup = "1" +ALLOW_EMPTY:${SRCNAME}-scheduler = "1" +ALLOW_EMPTY:${SRCNAME}-volume = "1" +ALLOW_EMPTY:${SRCNAME}-api = "1" -RDEPENDS_${SRCNAME}-tests += " bash python" +RDEPENDS:${SRCNAME}-tests += " bash python" -FILES_${PN} = "${libdir}/* /etc/tgt" +FILES:${PN} = "${libdir}/* /etc/tgt" -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools" +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools" -FILES_${SRCNAME}-api = " \ +FILES:${SRCNAME}-api = " \ ${bindir}/cinder-api \ " -FILES_${SRCNAME}-volume = " \ +FILES:${SRCNAME}-volume = " \ ${bindir}/cinder-volume \ " -FILES_${SRCNAME}-scheduler = " \ +FILES:${SRCNAME}-scheduler = " \ ${bindir}/cinder-scheduler \ " -FILES_${SRCNAME}-backup = " \ +FILES:${SRCNAME}-backup = " \ ${bindir}/cinder-backup \ " -FILES_${SRCNAME} = "${bindir}/* \ +FILES:${SRCNAME} = "${bindir}/* \ ${sysconfdir}/${SRCNAME}/* \ ${localstatedir}/* \ ${sysconfdir}/${SRCNAME}/drivers/* \ @@ -199,7 +199,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ lvm2 \ python-pbr \ python-babel \ @@ -262,17 +267,17 @@ RDEPENDS_${PN} += " \ python-cryptography \ " -RDEPENDS_${SRCNAME} = " \ +RDEPENDS:${SRCNAME} = " \ ${PN} \ postgresql \ postgresql-client \ python-psycopg2 \ tgt" -RDEPENDS_${SRCNAME}-api = "${SRCNAME}" -RDEPENDS_${SRCNAME}-volume = "${SRCNAME}" -RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}" -RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash" +RDEPENDS:${SRCNAME}-api = "${SRCNAME}" +RDEPENDS:${SRCNAME}-volume = "${SRCNAME}" +RDEPENDS:${SRCNAME}-scheduler = "${SRCNAME}" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash" SYSTEMD_PACKAGES = " \ ${SRCNAME}-setup \ @@ -282,17 +287,17 @@ SYSTEMD_PACKAGES = " \ ${SRCNAME}-backup \ " -SYSTEMD_SERVICE_${SRCNAME}-setup = "cinder-init.service" -SYSTEMD_SERVICE_${SRCNAME}-api = "cinder-api.service" -SYSTEMD_SERVICE_${SRCNAME}-volume = "cinder-volume.service" -SYSTEMD_SERVICE_${SRCNAME}-scheduler = "cinder-scheduler.service" -SYSTEMD_SERVICE_${SRCNAME}-backup = "cinder-backup.service" +SYSTEMD_SERVICE:${SRCNAME}-setup = "cinder-init.service" +SYSTEMD_SERVICE:${SRCNAME}-api = "cinder-api.service" +SYSTEMD_SERVICE:${SRCNAME}-volume = "cinder-volume.service" +SYSTEMD_SERVICE:${SRCNAME}-scheduler = "cinder-scheduler.service" +SYSTEMD_SERVICE:${SRCNAME}-backup = "cinder-backup.service" # Disable until they are configured (via -setup) -SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-volume = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-backup = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-api = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-volume = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-scheduler = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-backup = "disable" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "cinder" diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb index bacb25f9..bd360edf 100644 --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb @@ -8,7 +8,7 @@ DEPENDS = "python-setuptools3-git" SRCNAME = "python-cinderclient" SRC_URI = "\ - git://github.com/openstack/python-cinderclient.git;branch=stable/pike \ + git://github.com/openstack/python-cinderclient.git;branch=stable/pike;protocol=https \ file://cinder-api-check.sh \ " @@ -28,7 +28,7 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-pbr \ python-prettytable \ python-keystoneauth1 \ @@ -43,13 +43,13 @@ RDEPENDS_${PN} += " \ PACKAGECONFIG ?= "bash-completion" PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/bash_completion.d install -m 664 ${S}/tools/cinder.bash_completion ${D}/${sysconfdir}/bash_completion.d } PACKAGES =+ "${BPN}-bash-completion" -FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" +FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" MONITOR_CHECKS_${PN} += "\ cinder-api-check.sh \ diff --git a/meta-openstack/recipes-devtools/python/python-colorama.inc b/meta-openstack/recipes-devtools/python/python-colorama.inc deleted file mode 100644 index 4b5dc797..00000000 --- a/meta-openstack/recipes-devtools/python/python-colorama.inc +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2014 Wind River Systems, Inc. -# -DESCRIPTION = "Simple cross-platform colored terminal text in Python" -HOMEPAGE = "http://pypi.python.org/pypi/colorama" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" - -SRC_URI[md5sum] = "f927529cd1735f6f50ee2c61628e9c1f" -SRC_URI[sha256sum] = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-coverage.inc b/meta-openstack/recipes-devtools/python/python-coverage.inc deleted file mode 100644 index f1c50229..00000000 --- a/meta-openstack/recipes-devtools/python/python-coverage.inc +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2014 Wind River Systems, Inc. -# -DESCRIPTION = "Code coverage measurement for Python" -HOMEPAGE = "https://pypi.python.org/pypi/coverage" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb" - -SRC_URI[md5sum] = "37f4d8ae679b2c43a87da8d519817a3b" -SRC_URI[sha256sum] = "07a36ac3c82f5961c45565fd5575b4c568a8fc59e8d5d29a5b04dc8597a07e0e" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-croniter.inc b/meta-openstack/recipes-devtools/python/python-croniter.inc deleted file mode 100644 index 885aa9e1..00000000 --- a/meta-openstack/recipes-devtools/python/python-croniter.inc +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "croniter provides iteration for datetime object with cron like format" -HOMEPAGE = "https://pypi.python.org/pypi/croniter/0.3.4" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" - -# Archived version so we have to overwrite what the pypi class will derive -PYPI_SRC_URI = "https://pypi.python.org/packages/source/c/croniter/croniter-${PV}.tar.gz" - -SRC_URI[md5sum] = "e4a8987521b144c4c2149d4adde8f55c" -SRC_URI[sha256sum] = "538adeb3a7f7816c3cdec6db974c441620d764c25ff4ed0146ee7296b8a50590" - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-dateutil \ - " diff --git a/meta-openstack/recipes-devtools/python/python-cursive_git.bb b/meta-openstack/recipes-devtools/python/python-cursive_git.bb deleted file mode 100644 index 83be0340..00000000 --- a/meta-openstack/recipes-devtools/python/python-cursive_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Library for validation of digital signatures." -HOMEPAGE = "https://github.com/openstack/cursive" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI = "\ - git://git.openstack.org/openstack/cursive.git;branch=master \ - " - -PV="0.2.0+git${SRCPV}" -SRCREV="ad25a4016c56eeceb85764c7ac4501def2b5445a" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-lxml \ - python-cryptography \ - python-netifaces \ - python-six \ - python-oslo.serialization \ - python-oslo.utils \ - python-oslo.i18n \ - python-oslo.log \ - python-castellan \ - " diff --git a/meta-openstack/recipes-devtools/python/python-designateclient_git.bb b/meta-openstack/recipes-devtools/python/python-designateclient_git.bb deleted file mode 100644 index fdc92c23..00000000 --- a/meta-openstack/recipes-devtools/python/python-designateclient_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Python bindings to the Designate API" -HOMEPAGE = "https://github.com/openstack/python-designateclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-cliff \ - python-jsonschema \ - python-osc-lib \ - python-oslo.utils \ - python-pbr \ - python-keystoneauth1 \ - python-requests \ - python-six \ - python-stevedore \ - python-debtcollector \ - " - -SRCNAME = "designateclient" -SRC_URI = "git://github.com/openstack/${BPN}.git;branch=master" - -PV = "3.0.0+git${SRCPV}" -SRCREV = "093d8d7170cbf6ef8c7a7c0ff2a4dcd7ecd6361b" -S = "${WORKDIR}/git" - -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb deleted file mode 100644 index 6cc57ba8..00000000 --- a/meta-openstack/recipes-devtools/python/python-django-appconf_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-django-appconf.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-django-babel_git.bb b/meta-openstack/recipes-devtools/python/python-django-babel_git.bb deleted file mode 100644 index 3f4f9e31..00000000 --- a/meta-openstack/recipes-devtools/python/python-django-babel_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Tools for using Babel with Django" -HOMEPAGE = "https://github.com/python-babel/django-babel" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=5ae97ab65116b8d7890c59de57577b46" - -SRCNAME = "django-babel" - -PV = "0.5.1+git${SRCPV}" -SRCREV = "88b389381c0e269605311ae07029555b65a86bc5" - -SRC_URI = "git://github.com/python-babel/${SRCNAME}.git \ - " - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - " - -RDEPENDS_${PN} += " \ - python-django \ - python-babel \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb deleted file mode 100644 index 75c26b04..00000000 --- a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "A Django authentication backend for use with the OpenStack Keystone backend." -HOMEPAGE = "http://django_openstack_auth.readthedocs.org/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRCNAME = "django_openstack_auth" - -PV = "3.5.0+git${SRCPV}" -SRCREV = "9e108ed426a5a1e5c9dd394b197c27d046754d0c" - -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ -" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-django \ - python-oslo.config \ - python-oslo.policy \ - python-keystoneclient \ - python-keystoneauth1 \ - python-six \ - " diff --git a/meta-openstack/recipes-devtools/python/python-django_git.bb b/meta-openstack/recipes-devtools/python/python-django_git.bb deleted file mode 100644 index 20086045..00000000 --- a/meta-openstack/recipes-devtools/python/python-django_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "A high-level Python Web framework" -HOMEPAGE = "http://www.djangoproject.com/" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" - -SRCNAME = "Django" - -PV = "1.8.6" -SRCREV = "80b7e9d09f2d23209b591288f9b2cf3eb3d927c8" - -SRC_URI = " \ - git://github.com/django/django.git;branch=stable/1.8.x \ - " - -S = "${WORKDIR}/git" - -inherit setuptools3 - -FILES_${PN} += "${datadir}/django/*" - diff --git a/meta-openstack/recipes-devtools/python/python-dogpile.cache.inc b/meta-openstack/recipes-devtools/python/python-dogpile.cache.inc deleted file mode 100644 index 5074acfa..00000000 --- a/meta-openstack/recipes-devtools/python/python-dogpile.cache.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python Dogpile Cache: A caching front-end based on the Dogpile lock" -HOMEPAGE = "https://pypi.python.org/pypi/dogpile.cache" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e8d5890806254a2648269bb4029f74c6" - -SRC_URI[md5sum] = "d48b4752b404e2e2a33f984d261fff7d" -SRC_URI[sha256sum] = "b348835825c9dcd251d9aad1f89f257277ac198a3e35a61980ab4cb28c75216b" - -inherit pypi - - diff --git a/meta-openstack/recipes-devtools/python/python-dogpile.core.inc b/meta-openstack/recipes-devtools/python/python-dogpile.core.inc deleted file mode 100644 index 9824321f..00000000 --- a/meta-openstack/recipes-devtools/python/python-dogpile.core.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python Dogpile Core: Dogpile is basically the locking code extracted from the Beaker package, for simple and generic usage." -HOMEPAGE = "https://pypi.python.org/pypi/dogpile.core" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0401fd56584d7b3d4be91690672ec433" - -SRC_URI[md5sum] = "01cb19f52bba3e95c9b560f39341f045" -SRC_URI[sha256sum] = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76" - -inherit pypi - - diff --git a/meta-openstack/recipes-devtools/python/python-ecdsa.inc b/meta-openstack/recipes-devtools/python/python-ecdsa.inc deleted file mode 100644 index b7c8356a..00000000 --- a/meta-openstack/recipes-devtools/python/python-ecdsa.inc +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "ECDSA cryptographic signature library" -HOMEPAGE = "https://github.com/warner/python-ecdsa" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI[md5sum] = "1f60eda9cb5c46722856db41a3ae6670" -SRC_URI[sha256sum] = "64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - ${PYTHON_PN}-pbr \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-enum-compat.inc b/meta-openstack/recipes-devtools/python/python-enum-compat.inc deleted file mode 100644 index 9fa8c526..00000000 --- a/meta-openstack/recipes-devtools/python/python-enum-compat.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python enum/enum34 compatibility package" -HOMEPAGE = "https://github.com/jstasiak/enum-compat" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI[md5sum] = "74c19a80356825e5351aba8c4c1b00e6" -SRC_URI[sha256sum] = "3677daabed56a6f724451d585662253d8fb4e5569845aafa8bb0da36b1a8751e" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb b/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb deleted file mode 100644 index a9bff308..00000000 --- a/meta-openstack/recipes-devtools/python/python-enum-compat_0.0.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-enum-compat.inc diff --git a/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb b/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb deleted file mode 100644 index 4eb1ed5a..00000000 --- a/meta-openstack/recipes-devtools/python/python-enum_0.4.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Robust enumerated type support in Python" -DESCRIPTION = "This package provides a module for robust enumerations in Python." -HOMEPAGE = "https://pypi.python.org/pypi/enum" -SECTION = "devel/python" -LICENSE = "GPLv2 | PSFv2" -LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=4325afd396febcb659c36b49533135d4 \ - file://LICENSE.PSF;md5=1ad8a43fc3bbfea1585223c99f4c3e6f \ -" - -SRC_URI[md5sum] = "ce75c7c3c86741175a84456cc5bd531e" -SRC_URI[sha256sum] = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff" - -inherit setuptools3 pypi - -DEPENDS += " \ - python-pip \ -" - -RDEPENDS_${PN} += " \ -" diff --git a/meta-openstack/recipes-devtools/python/python-extras.inc b/meta-openstack/recipes-devtools/python/python-extras.inc deleted file mode 100644 index 45d57bbb..00000000 --- a/meta-openstack/recipes-devtools/python/python-extras.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Useful extra bits for Python - things that should be in the standard library" -HOMEPAGE = "https://pypi.python.org/pypi/extras/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6d108f338b2f68fe48ac366c4650bd8b" - -SRC_URI[md5sum] = "3a63ad60cf8f0186c9e3a02f55ec5b14" -SRC_URI[sha256sum] = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb b/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb deleted file mode 100644 index b014a72b..00000000 --- a/meta-openstack/recipes-devtools/python/python-falcon_0.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "An unladen web framework for building APIs and app backends." -HOMEPAGE = "http://falconframework.org" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=2bf705a48be7b7799862ffe602c94b87" - -SRC_URI[md5sum] = "bf9e8bdd20700f1ff7ce6397cd441fbd" -SRC_URI[sha256sum] = "92bb899bf6e58e2299e3b1de1e628b90c38544ba3354a0141d108318b50c3402" - -inherit setuptools3 pypi - -# conflicting file prevention -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/tests/* -} - -DEPENDS += " \ - python-pip \ - " - -RDEPENDS_${PN} += " \ - python-six \ - python-mimeparse \ - " diff --git a/meta-openstack/recipes-devtools/python/python-fasteners.inc b/meta-openstack/recipes-devtools/python/python-fasteners.inc deleted file mode 100644 index 6e5e5f0c..00000000 --- a/meta-openstack/recipes-devtools/python/python-fasteners.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "A python package that provides useful locks." -HOMEPAGE = "https://github.com/harlowja/fasteners" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" - -SRCNAME = "fasteners" - -PV = "0.15+git${SRCPV}" -SRCREV = "75148cb679c351966cd4ad5e9d177048a0ea8380" - -SRC_URI = "git://github.com/harlowja/${SRCNAME}.git" - -S = "${WORKDIR}/git" - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - ${PYTHON_PN}-pbr \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb b/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb deleted file mode 100644 index f476c429..00000000 --- a/meta-openstack/recipes-devtools/python/python-flake8_2.4.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "The modular source code checker: pep8, pyflakes and co" -HOMEPAGE = "https://github.com/dreamhost/cliff" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a76e57e683629e1ac2a49406169c2a3" - -SRC_URI[md5sum] = "d413935bb21026c18aca82654114502f" -SRC_URI[sha256sum] = "d26a9d0252da9f831b8277b824961bb10b1f9d79f4752d32e4814b7bcd1e089b" - -inherit setuptools3 pypi - -RDEPENDS_${PN} += "python-prettytable \ - python-cmd2 \ - python-pyparsing \ - python-mccabe \ - python-pep8 \ - python-pyflakes" diff --git a/meta-openstack/recipes-devtools/python/python-funcsigs.inc b/meta-openstack/recipes-devtools/python/python-funcsigs.inc deleted file mode 100644 index 24c4894e..00000000 --- a/meta-openstack/recipes-devtools/python/python-funcsigs.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+" -HOMEPAGE = "http://funcsigs.readthedocs.org" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6bc91dc8e5793892189fe7481a2d354" - -SRC_URI[md5sum] = "7e583285b1fb8a76305d6d68f4ccc14e" -SRC_URI[sha256sum] = "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" - -inherit pypi - -CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python-functools32_git.bb b/meta-openstack/recipes-devtools/python/python-functools32_git.bb deleted file mode 100644 index 9744b522..00000000 --- a/meta-openstack/recipes-devtools/python/python-functools32_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Python higher-order functions and operations on callable objects" -HOMEPAGE = "https://pypi.python.org/pypi/functools32" -SECTION = "devel/python" -LICENSE = "PSFv2" - -PV = "3.2.3-2" -SRCREV = "ad90fa86e2f4f494a3aedb0571274f3bbc6d7ab5" - -SRCNAME = "functools32" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=27cf2345969ed18e6730e90fb0063a10" -SRC_URI = "git://github.com/MiCHiLU/python-${SRCNAME}.git" - -S = "${WORKDIR}/git" - -inherit distutils3 - -DISTUTILS_INSTALL_ARGS = "--root=${D} \ - --prefix=${prefix} \ - --install-lib=${PYTHON_SITEPACKAGES_DIR} \ - --install-data=${datadir}" - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += "python-testtools \ - python-pbr \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-futures_git.bb b/meta-openstack/recipes-devtools/python/python-futures_git.bb deleted file mode 100644 index 493aef17..00000000 --- a/meta-openstack/recipes-devtools/python/python-futures_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Backport of the concurrent.futures package from Python 3.2" -HOMEPAGE = "https://github.com/agronholm/pythonfutures" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dd6708d05936d3f6c4e20ed14c87b5e3" - -PV = "3.3.0+git${SRCPV}" -SRCREV = "ec78e222ece60721fc92a6c650df3116cb15d24e" - -SRCNAME = "futures" -SRC_URI = "git://github.com/agronholm/python${SRCNAME}.git" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb b/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb deleted file mode 100644 index 4996072d..00000000 --- a/meta-openstack/recipes-devtools/python/python-futurist_1.10.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Useful additions to futures, from the future" -HOMEPAGE = "https://pypi.python.org/pypi/futurist" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI[md5sum] = "d7f98e9a5cb09fe9706e4afcbeab1552" -SRC_URI[sha256sum] = "139d223503d47275636285ae98e7b470085b2b3b6fb2fc9a0d04a76de4b3d30e" - -inherit setuptools3 pypi - -DEPENDS += " \ - python-pip \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - python-monotonic \ - python-futures \ - python-contextlib2 \ - python-prettytable \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-gevent-websocket.inc b/meta-openstack/recipes-devtools/python/python-gevent-websocket.inc deleted file mode 100644 index 011c23ec..00000000 --- a/meta-openstack/recipes-devtools/python/python-gevent-websocket.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Websocket handler for the gevent pywsgi server, a Python network library" -HOMEPAGE = "https://gitlab.com/noppo/gevent-websocket" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5aa2f1d4ea55d60497aa8c3debf29ab2" - -SRC_URI[md5sum] = "e095bf3358175489a956949c1b4de9ff" -SRC_URI[sha256sum] = "7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2d85fb0" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-gevent \ - " diff --git a/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb b/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb deleted file mode 100644 index 99e4946b..00000000 --- a/meta-openstack/recipes-devtools/python/python-gevent-websocket_0.10.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-gevent-websocket.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python-glance-store_git.bb deleted file mode 100644 index 037e4a07..00000000 --- a/meta-openstack/recipes-devtools/python/python-glance-store_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Glance stores library" -HOMEPAGE = "https://github.com/openstack/glance_store" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI = "\ - git://git.openstack.org/openstack/glance_store.git;branch=stable/pike \ - " - -PV="0.22.0+git${SRCPV}" -SRCREV="49c915f498fc8d91c98fcf4e07ceecdcf167fc5a" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - bash \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.serialization \ - python-oslo.utils \ - python-oslo.concurrency \ - python-stevedore \ - python-enum34 \ - python-eventlet \ - python-six \ - python-jsonschema \ - python-keystoneauth1 \ - python-keystoneclient \ - python-requests \ - " diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 0417ce58..9fa23ed8 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "glance" -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://glance.init \ file://glance-api.service \ file://glance-registry.service \ @@ -25,8 +25,8 @@ USER = "glance" GROUP = "glance" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${GROUP}" -USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}" +GROUPADD_PARAM:${PN} = "--system ${GROUP}" +USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/glance -s /bin/false -g ${GROUP} ${USER}" GLANCE_DEFAULT_STORE ?= "file" GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\ @@ -56,13 +56,13 @@ python () { } SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" -do_install_prepend() { +do_install:prepend() { sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/utils.py } -do_install_append() { +do_install:append() { SRC_SYSCONFDIR=${S}${sysconfdir} GLANCE_CONF_DIR=${D}${sysconfdir}/glance @@ -140,26 +140,26 @@ do_install_append() { PACKAGES += " ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-registry" -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/* \ ${datadir}/etc/${SRCNAME}* \ " -FILES_${SRCNAME} = "${bindir}/* \ +FILES:${SRCNAME} = "${bindir}/* \ ${sysconfdir}/${SRCNAME}/* \ ${localstatedir}/* \ " -FILES_${SRCNAME}-setup = " \ +FILES:${SRCNAME}-setup = " \ ${systemd_unitdir}/system/glance-init.service \ " -FILES_${SRCNAME}-api = " \ +FILES:${SRCNAME}-api = " \ ${bindir}/glance-api \ ${systemd_unitdir}/system/glance-api.service \ " -FILES_${SRCNAME}-registry = "\ +FILES:${SRCNAME}-registry = "\ ${bindir}/glance-registry \ ${systemd_unitdir}/system/glance-registry.service \ " @@ -169,7 +169,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ coreutils \ python-pbr \ python-sqlalchemy \ @@ -213,22 +218,22 @@ RDEPENDS_${PN} += " \ python-monotonic \ " -RDEPENDS_${SRCNAME} = " \ +RDEPENDS:${SRCNAME} = " \ ${PN} \ postgresql \ postgresql-client \ python-psycopg2 \ " -RDEPENDS_${SRCNAME}-api = "${SRCNAME}" -RDEPENDS_${SRCNAME}-registry = "${SRCNAME}" -RDEPENDS_${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}" -RDEPENDS_${SRCNAME}-tests = "python-psutil qpid-python bash" +RDEPENDS:${SRCNAME}-api = "${SRCNAME}" +RDEPENDS:${SRCNAME}-registry = "${SRCNAME}" +RDEPENDS:${SRCNAME}-setup = "postgresql keystone-setup sudo ${SRCNAME}" +RDEPENDS:${SRCNAME}-tests = "python-psutil qpid-python bash" SYSTEMD_PACKAGES = "${SRCNAME}-api ${SRCNAME}-registry ${SRCNAME}-setup" -SYSTEMD_SERVICE_${SRCNAME}-api = "glance-api.service" -SYSTEMD_SERVICE_${SRCNAME}-registry = "glance-registry.service" -SYSTEMD_SERVICE_${SRCNAME}-setup = "glance-init.service" +SYSTEMD_SERVICE:${SRCNAME}-api = "glance-api.service" +SYSTEMD_SERVICE:${SRCNAME}-registry = "glance-registry.service" +SYSTEMD_SERVICE:${SRCNAME}-setup = "glance-init.service" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "glance" diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb index a41405f5..01be0cff 100644 --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/openstack/python-glanceclient" SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI = "git://github.com/openstack/python-glanceclient.git \ +SRC_URI = "git://github.com/openstack/python-glanceclient.git;branch=master;protocol=https \ file://glance-api-check.sh \ " @@ -19,14 +19,14 @@ DEPENDS += " \ inherit setuptools3 monitor rmargparse -FILES_${PN} += "${datadir}/${SRCNAME}" +FILES:${PN} += "${datadir}/${SRCNAME}" # Satisfy setup.py 'setup_requires' DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ gmp \ bash \ python-pbr \ diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb index b52fbdf7..9ae104a6 100644 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb @@ -8,7 +8,7 @@ SRCREV = "c816b38d9f12be75d989409cbab6dfefa8f49dc3" PV = "0.9.1+git${SRCPV}" SRC_URI = "\ - git://github.com/openstack/glance_store.git \ + git://github.com/openstack/glance_store.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" @@ -21,7 +21,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} = " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} = " \ python-enum34 \ python-eventlet \ python-iso8601 \ diff --git a/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb b/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb deleted file mode 100644 index 8aec8ce6..00000000 --- a/meta-openstack/recipes-devtools/python/python-google-api-python-client_1.6.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Client library for accessing the Plus, Moderator, and many other Google APIs." -AUTHOR = "Google Inc." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" - -inherit setuptools3 pypi - -SRC_URI[md5sum] = "3059dce9c0308852e177c7d99d3f9ac2" -SRC_URI[sha256sum] = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b" - -RDEPENDS_${PN} += " \ - python-httplib2 \ - python-oauth2client \ - python-six \ - python-uritemplate \ - " diff --git a/meta-openstack/recipes-devtools/python/python-happybase.inc b/meta-openstack/recipes-devtools/python/python-happybase.inc deleted file mode 100644 index 325b2d1e..00000000 --- a/meta-openstack/recipes-devtools/python/python-happybase.inc +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Python library to interact with Apache HBase" -HOMEPAGE = "https://pypi.python.org/pypi/happybase/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=41f55ae3d7000e4323e84c468d8b42ee" - -SRC_URI[md5sum] = "96cb7ea8163f531907fabd0dddc8b87e" -SRC_URI[sha256sum] = "850b4ee651128588a57e1e152dd1252e5ec39776a5d3d14ee892b8bac0fa9e1a" - -inherit pypi - -do_install_append() { - perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt") - perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO") - for f in $perm_files; do - chmod 644 "${f}" - done -} diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index a3102ffa..00709283 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "heat" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://heat.conf \ file://heat.init \ file://autoscaling_example.template \ @@ -57,7 +57,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-cfn" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} HEAT_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -106,7 +106,7 @@ do_install_append() { fi } -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 @@ -127,30 +127,30 @@ PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}- PACKAGES += "${SRCNAME}-setup" PACKAGES += "${SRCNAME}-cfn" -RDEPENDS_${SRCNAME}-tests += " bash" +RDEPENDS:${SRCNAME}-tests += " bash" -ALLOW_EMPTY_${SRCNAME}-tests = "1" -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-templates = "1" -ALLOW_EMPTY_${SRCNAME}-cfn = "1" +ALLOW_EMPTY:${SRCNAME}-tests = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-templates = "1" +ALLOW_EMPTY:${SRCNAME}-cfn = "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}-templates = "${sysconfdir}/${SRCNAME}/templates/*" +FILES:${SRCNAME}-templates = "${sysconfdir}/${SRCNAME}/templates/*" -FILES_${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \ +FILES:${SRCNAME}-common = "${sysconfdir}/${SRCNAME}/* \ " -FILES_${SRCNAME}-api = "${bindir}/heat-api \ +FILES:${SRCNAME}-api = "${bindir}/heat-api \ ${sysconfdir}/init.d/heat-api \ " -FILES_${SRCNAME}-api-cfn = "${bindir}/heat-api-cfn \ +FILES:${SRCNAME}-api-cfn = "${bindir}/heat-api-cfn \ ${sysconfdir}/init.d/heat-api-cfn \ " -FILES_${SRCNAME}-engine = "${bindir}/heat-engine \ +FILES:${SRCNAME}-engine = "${bindir}/heat-engine \ ${bindir}/* \ ${sysconfdir}/init.d/heat-engine \ " @@ -165,7 +165,7 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-heatclient \ python-sqlalchemy \ python-amqplib \ @@ -246,20 +246,20 @@ RDEPENDS_${PN} += " \ bash \ " -RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn bash" -RDEPENDS_${SRCNAME}-api = "${SRCNAME}-engine" -RDEPENDS_${SRCNAME}-api-cfn = "${SRCNAME}-engine" -RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine" -RDEPENDS_${SRCNAME}-templates = "postgresql sudo" -RDEPENDS_${SRCNAME}-cfn = "postgresql sudo" +RDEPENDS:${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn bash" +RDEPENDS:${SRCNAME}-api = "${SRCNAME}-engine" +RDEPENDS:${SRCNAME}-api-cfn = "${SRCNAME}-engine" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine" +RDEPENDS:${SRCNAME}-templates = "postgresql sudo" +RDEPENDS:${SRCNAME}-cfn = "postgresql sudo" INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" -INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" -INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn" -INITSCRIPT_PARAMS_${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-engine = "${SRCNAME}-engine" -INITSCRIPT_PARAMS_${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-api = "${SRCNAME}-api" +INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-api-cfn = "${SRCNAME}-api-cfn" +INITSCRIPT_PARAMS:${SRCNAME}-api-cfn = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-engine = "${SRCNAME}-engine" +INITSCRIPT_PARAMS:${SRCNAME}-engine = "${OS_DEFAULT_INITSCRIPT_PARAMS}" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "heat" diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb index e0927f3c..0c153805 100644 --- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb @@ -14,7 +14,7 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} +="python-cliff \ +RDEPENDS:${PN} +="python-cliff \ python-httplib2 \ python-iso8601 \ python-prettytable \ @@ -27,7 +27,7 @@ RDEPENDS_${PN} +="python-cliff \ PR = "r0" SRCNAME = "heatclient" -SRC_URI = "git://github.com/openstack/python-heatclient.git;branch=master" +SRC_URI = "git://github.com/openstack/python-heatclient.git;branch=master;protocol=https" PV = "1.17.0+git${SRCPV}" SRCREV = "8af5deb458d51f4ec16e769d7fd6c94655f82f5f" @@ -39,15 +39,15 @@ inherit setuptools3 PACKAGECONFIG ?= "bash-completion" PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/bash_completion.d install -m 664 ${S}/tools/heat.bash_completion ${D}/${sysconfdir}/bash_completion.d } PACKAGES =+ "${SRCNAME}-tests ${BPN}-bash-completion" -FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" -ALLOW_EMPTY_${SRCNAME}-tests = "1" +FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" +ALLOW_EMPTY:${SRCNAME}-tests = "1" -RDEPENDS_${SRCNAME}-tests += "python-testscenarios \ +RDEPENDS:${SRCNAME}-tests += "python-testscenarios \ python-mox3 \ " diff --git a/meta-openstack/recipes-devtools/python/python-hgtools.inc b/meta-openstack/recipes-devtools/python/python-hgtools.inc deleted file mode 100644 index 561df3da..00000000 --- a/meta-openstack/recipes-devtools/python/python-hgtools.inc +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Classes and setuptools plugin for Mercurial repositories" -HOMEPAGE = "https://pypi.python.org/pypi/hgtools" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a428d7abf1504d4dfeb4cbde155ba484" - -PYPI_PACKAGE_EXT = "zip" - -SRC_URI[md5sum] = "584d74b81b1efae3604c53086d1a3acb" -SRC_URI[sha256sum] = "1d0ef6ceaba1673e6923b17d7f09c5ae2f4394d16ef80562812987a27e7836ff" - -inherit pypi - diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 875104a5..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 \ @@ -91,13 +96,13 @@ 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 \ diff --git a/meta-openstack/recipes-devtools/python/python-httplib2.inc b/meta-openstack/recipes-devtools/python/python-httplib2.inc deleted file mode 100644 index 35c8b1c1..00000000 --- a/meta-openstack/recipes-devtools/python/python-httplib2.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A comprehensive HTTP client library" -HOMEPAGE = "https://code.google.com/p/httplib2/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=2d0e1e5a49b6ead3380e3ac544351eb9" - -SRC_URI[md5sum] = "427cda9f4d55762db325bd2eb46b7fe0" -SRC_URI[sha256sum] = "34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107" - -inherit pypi - -do_install_append() { - perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt"` - for f in $perm_files; do - chmod 644 "${f}" - done -} diff --git a/meta-openstack/recipes-devtools/python/python-httpretty.inc b/meta-openstack/recipes-devtools/python/python-httpretty.inc deleted file mode 100644 index 97bd6b3d..00000000 --- a/meta-openstack/recipes-devtools/python/python-httpretty.inc +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2014 Wind River Systems, Inc. -# -DESCRIPTION = "HTTP client mock for Python" -HOMEPAGE = "https://pypi.python.org/pypi/httpretty" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=113a91608a1d89039af9393c39bcaa2c" - -SRC_URI[md5sum] = "2fc3d0dc986200be95ce8ad3ef56bc04" -SRC_URI[sha256sum] = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb b/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb deleted file mode 100644 index 989f7154..00000000 --- a/meta-openstack/recipes-devtools/python/python-ipaddr_2.1.11.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Google's IP address manipulation library" -HOMEPAGE = "http://code.google.com/p/ipaddr-py/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=d8b8c1199001505d7b77da5db34ba441" - -SRC_URI[md5sum] = "f2c7852f95862715f92e7d089dc3f2cf" -SRC_URI[sha256sum] = "1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7" - -inherit distutils3 pypi - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb b/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb deleted file mode 100644 index cd845474..00000000 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw-ext_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Extensions for JSONPath RW" -HOMEPAGE = "https://github.com/sileht/python-jsonpath-rw-ext" -SECTION = "devel/python" -LICENSE = "Apache-2.0" - -PV = "0.1.9+git${SRCPV}" -SRCREV = "0a2d032f9743f5c9dd0f29be20a22b3f3388a93d" - -SRCNAME = "jsonpath-rw-ext" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRC_URI = "git://github.com/sileht/${BPN}.git" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-babel \ - python-jsonpath-rw \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw.inc b/meta-openstack/recipes-devtools/python/python-jsonpath-rw.inc deleted file mode 100644 index dc2bad23..00000000 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "A robust and significantly extended implementation of JSONPath for Python" -HOMEPAGE = "https://github.com/kennknowles/python-jsonpath-rw" -SECTION = "devel/python" -LICENSE = "BSD+" -LIC_FILES_CHKSUM = "file://README.rst;md5=02384665f821c394981e0dd1faec9a7d" - -SRC_URI[md5sum] = "3a807e05c2c12158fc6bb0a402fd5778" -SRC_URI[sha256sum] = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb b/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb deleted file mode 100644 index c320f012..00000000 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.4.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-jsonpath-rw.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-kafka.inc b/meta-openstack/recipes-devtools/python/python-kafka.inc deleted file mode 100644 index 0b360c1a..00000000 --- a/meta-openstack/recipes-devtools/python/python-kafka.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Python client for Apache Kafka" -HOMEPAGE = "https://github.com/mumrah/kafka-python" -SECTION = "devel/python" -LICENSE = "Apache-2.0" - -PV = "1.4.7+git${SRCPV}" -SRCREV = "0552b04326c73be29f209c12920ef4cbaceb9818" - -SRCNAME = "kafka-python" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=22efebb1e053dcc946f4b9d17f3cbbea" -SRC_URI = "git://github.com/mumrah/${SRCNAME}.git" - -S = "${WORKDIR}/git" - -DEPENDS += " \ - ${PYTHON_PN}-pbr \ - " - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-six \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb b/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb deleted file mode 100644 index e137fc67..00000000 --- a/meta-openstack/recipes-devtools/python/python-keyring_5.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Store and access your passwords safely" -HOMEPAGE = "https://pypi.python.org/pypi/keyring/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://CONTRIBUTORS.txt;md5=50793e96bcc5250698eddfef509a2061" - -PYPI_PACKAGE_EXT = "zip" - -SRC_URI[md5sum] = "fd50a2be4a44a78efb09a7c046b6410d" -SRC_URI[sha256sum] = "ac2b4dc17e6edfb804b09ade15df79f251522e442976ea0c8ea0051474502cf5" - -inherit setuptools3 pypi - -DEPENDS += " python-hgtools" diff --git a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb index e595180c..72f5a04d 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://hybrid_identity.py;beginline=1;endline=14;md5=06c14f6 PR = "r0" -SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana" +SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana;protocol=https" PV="git${SRCPV}" SRCREV="0bd376242f8522edef7031d2339b9533b86c17aa" @@ -14,9 +14,9 @@ S = "${WORKDIR}/git" inherit python3-dir -do_install_append() { +do_install:append() { install -D -m 0644 hybrid_assignment.py ${D}/${PYTHON_SITEPACKAGES_DIR}/keystone/assignment/backends/hybrid_assignment.py install -D -m 0644 hybrid_identity.py ${D}/${PYTHON_SITEPACKAGES_DIR}/keystone/identity/backends/hybrid_identity.py } -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index a8cc9440..a1b5dd0b 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "keystone" -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://keystone-init \ file://keystone-init.service \ file://keystone.conf \ @@ -32,7 +32,7 @@ SERVICE_TOKEN = "password" TOKEN_FORMAT ?= "PKI" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -m -s /bin/false keystone" +USERADD_PARAM:${PN} = "--system -m -s /bin/false keystone" LDAP_DN ?= "dc=my-domain,dc=com" @@ -65,7 +65,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone KEYSTONE_PACKAGE_DIR=${D}${PYTHON_SITEPACKAGES_DIR}/keystone @@ -191,7 +191,7 @@ role_tree_dn = ou=Roles,${LDAP_DN} \ # this token flush cronjob to run every 2 days KEYSTONE_TOKEN_FLUSH_TIME ??= "0 0 */2 * *" -pkg_postinst_${SRCNAME}-cronjobs () { +pkg_postinst:${SRCNAME}-cronjobs () { if [ -z "$D" ]; then # By default keystone expired tokens are not automatic removed out of the # database. So we create a cronjob for cleaning these expired tokens. @@ -202,20 +202,20 @@ pkg_postinst_${SRCNAME}-cronjobs () { PACKAGES += " ${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-cronjobs" SYSTEMD_PACKAGES += "${SRCNAME}-setup" -SYSTEMD_SERVICE_${SRCNAME}-setup = "keystone-init.service" +SYSTEMD_SERVICE:${SRCNAME}-setup = "keystone-init.service" -FILES_${SRCNAME}-setup = " \ +FILES:${SRCNAME}-setup = " \ ${systemd_unitdir}/system \ " -ALLOW_EMPTY_${SRCNAME}-cronjobs = "1" +ALLOW_EMPTY:${SRCNAME}-cronjobs = "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}/* \ ${localstatedir}/* \ ${datadir}/openstack-dashboard/openstack_dashboard/api/keystone-httpd.py \ @@ -232,7 +232,7 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-babel \ python-pbr \ python-webob \ @@ -271,7 +271,7 @@ RDEPENDS_${PN} += " \ python-pytz \ " -RDEPENDS_${SRCNAME}-tests += " bash" +RDEPENDS:${SRCNAME}-tests += " bash" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" @@ -279,7 +279,7 @@ PACKAGECONFIG[OpenLDAP] = ",,,python-ldap python-keystone-hybrid-backend" # TODO: # if DISTRO_FEATURE contains "tempest" then add *-tests to the main RDEPENDS -RDEPENDS_${SRCNAME} = " \ +RDEPENDS:${SRCNAME} = " \ ${PN} \ postgresql \ postgresql-client \ @@ -287,8 +287,8 @@ RDEPENDS_${SRCNAME} = " \ apache2 \ " -RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" -RDEPENDS_${SRCNAME}-cronjobs = "cronie ${SRCNAME}" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}" +RDEPENDS:${SRCNAME}-cronjobs = "cronie ${SRCNAME}" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "keystone" diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb deleted file mode 100644 index c7bfef42..00000000 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb +++ /dev/null @@ -1,62 +0,0 @@ -DESCRIPTION = "Client library for OpenStack Identity API" -HOMEPAGE = "https://github.com/openstack/python-keystoneclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55" - -SRCNAME = "keystoneclient" - -SRC_URI = "\ - git://github.com/openstack/python-keystoneclient.git;branch=stable/pike \ - file://keystone-api-check.sh \ - " - -PV = "3.13.0+git${SRCPV}" -SRCREV = "7ff05baa1fa56f152173651f16fc6fd181291292" -S = "${WORKDIR}/git" - -inherit setuptools3 monitor - -FILES_${PN}-doc += "${datadir}/keystoneclient" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - bash \ - python-pbr \ - python-debtcollector \ - python-keystoneauth1 \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.serialization \ - python-oslo.utils \ - python-positional \ - python-requests \ - python-six \ - python-stevedore \ - " - -do_install_append() { - cp -r ${S}/examples ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME} -} - -PACKAGES =+ " ${SRCNAME}-tests" - -FILES_${SRCNAME}-tests = "${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \ - " -RDEPENDS_${SRCNAME}-tests += " \ - python-httpretty \ - bash \ - " - -MONITOR_CHECKS_${PN} += "\ - keystone-api-check.sh \ -" diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb deleted file mode 100644 index c7309063..00000000 --- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Middleware for OpenStack Identity API" -HOMEPAGE = "https://launchpad.net/keystonemiddleware" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55" - -SRCNAME = "keystonemiddleware" - -SRC_URI = "\ - git://git.openstack.org/openstack/keystonemiddleware;branch=stable/pike \ - " - -PV = "4.17.0+git${SRCPV}" -SRCREV = "69aed2693475797c8d0dda2725a790eea05a9419" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-keystoneauth1 \ - python-oslo.config \ - python-oslo.context \ - python-oslo.i18n \ - python-oslo.log \ - python-oslo.serialization \ - python-oslo.utils \ - python-pbr \ - python-positional \ - python-pycadf \ - python-keystoneclient \ - python-requests \ - python-six \ - python-webob \ - " diff --git a/meta-openstack/recipes-devtools/python/python-logutils.inc b/meta-openstack/recipes-devtools/python/python-logutils.inc deleted file mode 100644 index 87ab631b..00000000 --- a/meta-openstack/recipes-devtools/python/python-logutils.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Set of handlers for the Python standard library's logging package" -HOMEPAGE = "https://pypi.python.org/pypi/logutils" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44c35f0b8e2a27a2f33a4e4a5c65d014" - -SRC_URI[md5sum] = "fcd2f8e9217bfa0b580f253b35a9d954" -SRC_URI[sha256sum] = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82" - -inherit pypi - -# avoid "error: option --single-version-externally-managed not recognized" -DISTUTILS_INSTALL_ARGS = "--root=${D} \ - --prefix=${prefix} \ - --install-lib=${PYTHON_SITEPACKAGES_DIR} \ - --install-data=${datadir}" diff --git a/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb b/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb deleted file mode 100644 index 959852b0..00000000 --- a/meta-openstack/recipes-devtools/python/python-magnumclient_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Python client for containers service" -HOMEPAGE = "https://github.com/openstack/python-magnumclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} +=" \ - python-pbr \ - python-babel \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.serialization \ - python-oslo.utils \ - python-iso8601 \ - python-requests \ - python-keystoneclient \ - python-pyyaml \ - python-stevedore \ - python-six \ - " - -SRCNAME = "magnumclient" -SRC_URI = "git://github.com/openstack/${BPN}.git;branch=master" - -PV = "1.0.0.0b1+git${SRCPV}" -SRCREV = "fb1ff6777eb96a5b7ba38156bf8354cda9b88ad4" -S = "${WORKDIR}/git" - -inherit setuptools3 rmargparse diff --git a/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb b/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb deleted file mode 100644 index 2748efc2..00000000 --- a/meta-openstack/recipes-devtools/python/python-manilaclient_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Python bindings to the OpenStack Manila API" -HOMEPAGE = "https://github.com/openstack/python-manilaclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9edbbf5857ab51214ef0e8b79069bb07" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} +=" \ - python-pbr \ - python-iso8601 \ - python-oslo.config \ - python-oslo.log \ - python-oslo.serialization \ - python-oslo.utils \ - python-prettytable \ - python-pycrypto \ - python-requests \ - python-simplejson \ - python-babel \ - python-six \ - python-keystoneclient \ - " - -SRCNAME = "manilaclient" -SRC_URI = "git://github.com/openstack/${BPN}.git;branch=master" - -PV = "1.29.0+git${SRCPV}" -SRCREV = "1b2cafb008bee70242b68a03212bcc575df683b9" -S = "${WORKDIR}/git" - -inherit setuptools3 rmargparse diff --git a/meta-openstack/recipes-devtools/python/python-mccabe.inc b/meta-openstack/recipes-devtools/python/python-mccabe.inc deleted file mode 100644 index 5f5e91d8..00000000 --- a/meta-openstack/recipes-devtools/python/python-mccabe.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "McCabe checker, plugin for flake8" -HOMEPAGE = "https://github.com/dreamhost/cliff" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=aa0383f6aee4f5c20084a97cd13164c4" - -SRC_URI[md5sum] = "5a3f3fa6a4bad126c88aaaa7dab682f5" -SRC_URI[sha256sum] = "5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing" diff --git a/meta-openstack/recipes-devtools/python/python-memcache.inc b/meta-openstack/recipes-devtools/python/python-memcache.inc deleted file mode 100644 index 61fe67d9..00000000 --- a/meta-openstack/recipes-devtools/python/python-memcache.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A comprehensive, fast, pure Python memcached client" -HOMEPAGE = "https://github.com/Pinterest/pymemcache" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e8538d10fb74087ea2dc61033b6ebf9f" - -PYPI_PACKAGE = "pymemcache" - -SRC_URI[md5sum] = "215510250997423a2a57da061b1bd592" -SRC_URI[sha256sum] = "05fd71f0337384024cc3d1340d35fd0d46307cf711eac9365b0eb166812bb121" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-memcached.inc b/meta-openstack/recipes-devtools/python/python-memcached.inc deleted file mode 100644 index 5acf43c6..00000000 --- a/meta-openstack/recipes-devtools/python/python-memcached.inc +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Pure python memcached client" -DESCRIPTION = "\ - This software is a 100% Python interface to the memcached memory cache daemon. \ - It is the client side software which allows storing values in one or more, possibly remote, \ - memcached servers. Search google for memcached for more information." -HOMEPAGE = "https://pypi.python.org/pypi/python-memcached/" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PSF.LICENSE;md5=7dd786e8594f1e787da94a946557b40e" - -PV = "1.57+git${SRCPV}" -SRCREV = "664bd3e23fe500fbde4c70636e2d24c8fd2f35af" - -SRC_URI = "git://github.com/linsomniac/python-memcached.git" - -S = "${WORKDIR}/git" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-six \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb b/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb deleted file mode 100644 index c9002e9e..00000000 --- a/meta-openstack/recipes-devtools/python/python-mistralclient_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Python client for Mistral REST API" -HOMEPAGE = "https://github.com/openstack/python-mistralclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} +=" \ - python-cliff \ - python-pbr \ - python-keystoneclient \ - python-pyyaml \ - python-requests \ - " - -SRCNAME = "mistralclient" -SRC_URI = "git://github.com/openstack/${BPN}.git;branch=master" - -PV = "1.1.0+git${SRCPV}" -SRCREV = "48e2780ee0148efc186c8972ca22e572fa2433c5" -S = "${WORKDIR}/git" - -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-mock.inc b/meta-openstack/recipes-devtools/python/python-mock.inc deleted file mode 100644 index f05061f3..00000000 --- a/meta-openstack/recipes-devtools/python/python-mock.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A Python Mocking and Patching Library for Testing" -HOMEPAGE = "https://pypi.python.org/pypi/mock" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-pep8 \ - ${PYTHON_PN}-pyflakes" diff --git a/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb b/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb deleted file mode 100644 index bdd5fbee..00000000 --- a/meta-openstack/recipes-devtools/python/python-mox_0.5.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Mock object framework" -HOMEPAGE = "https://github.com/dreamhost/cliff" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "6de7371e7e8bd9e2dad3fef2646f4a43" -SRC_URI[sha256sum] = "424ee725ee12652802b4e86571f816059b0d392401ceae70bf6487d65602cba9" - -inherit distutils3 pypi - -DISTUTILS_INSTALL_ARGS = "--root=${D} \ - --prefix=${prefix} \ - --install-lib=${PYTHON_SITEPACKAGES_DIR} \ - --install-data=${datadir}" diff --git a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb index 7a3223f4..343942f4 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb @@ -18,7 +18,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-pbr \ python-sqlalchemy \ python-debtcollector \ diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 08374569..11dbb843 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "neutron" -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://neutron-server.service \ file://neutron.conf \ file://l3_agent.ini \ @@ -38,8 +38,8 @@ USER = "neutron" GROUP = "neutron" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${GROUP}" -USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}" +GROUPADD_PARAM:${PN} = "--system ${GROUP}" +USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}" SERVICECREATE_PACKAGES = "${SRCNAME}-setup" KEYSTONE_HOST="${CONTROLLER_IP}" @@ -60,7 +60,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/ NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron @@ -214,7 +214,7 @@ do_install_append() { install -m 600 ${S}/etc/neutron/rootwrap.d/* ${NEUTRON_CONF_DIR}/rootwrap.d/ } -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 @@ -229,15 +229,15 @@ pkg_postinst_${SRCNAME}-setup () { fi } -pkg_postinst_${SRCNAME}-plugin-openvswitch-setup () { +pkg_postinst:${SRCNAME}-plugin-openvswitch-setup () { if [ -z "$D" ]; then /etc/init.d/openvswitch-switch start ovs-vsctl --no-wait -- --may-exist add-br br-int fi } -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-plugin-openvswitch-setup = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-plugin-openvswitch-setup = "1" PACKAGES += " \ ${SRCNAME}-tests \ @@ -257,13 +257,13 @@ PACKAGES += " \ ${SRCNAME}-plugin-openvswitch-setup \ " -FILES_${PN} = "${libdir}/*" +FILES:${PN} = "${libdir}/*" -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" -RDEPENDS_${SRCNAME}-tests += " bash" +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" +RDEPENDS:${SRCNAME}-tests += " bash" -FILES_${SRCNAME} = " \ +FILES:${SRCNAME} = " \ ${bindir}/neutron-db-manage \ ${bindir}/neutron-rootwrap \ ${bindir}/neutron-debug \ @@ -278,53 +278,53 @@ FILES_${SRCNAME} = " \ ${localstatedir}/* \ " -FILES_${SRCNAME}-server = " \ +FILES:${SRCNAME}-server = " \ ${bindir}/neutron-server \ ${sysconfdir}/neutron/plugin.ini \ " -FILES_${SRCNAME}-plugin-ml2 = " \ +FILES:${SRCNAME}-plugin-ml2 = " \ ${sysconfdir}/${SRCNAME}/plugins/ml2/* \ " -FILES_${SRCNAME}-plugin-openvswitch = " \ +FILES:${SRCNAME}-plugin-openvswitch = " \ ${bindir}/neutron-openvswitch-agent \ ${sysconfdir}/init.d/neutron-openvswitch-agent \ " -FILES_${SRCNAME}-dhcp-agent = " \ +FILES:${SRCNAME}-dhcp-agent = " \ ${bindir}/neutron-dhcp-agent \ ${bindir}/neutron-dhcp-agent-dnsmasq-lease-update \ ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \ ${sysconfdir}/cron.d/neutron-dhcp-agent-netns-cleanup \ " -FILES_${SRCNAME}-linuxbridge-agent = " \ +FILES:${SRCNAME}-linuxbridge-agent = " \ ${bindir}/neutron-linuxbridge-agent \ ${sysconfdir}/${SRCNAME}/plugins/ml2/linuxbridge_agent.ini \ " -FILES_${SRCNAME}-l3-agent = " \ +FILES:${SRCNAME}-l3-agent = " \ ${bindir}/neutron-l3-agent \ ${sysconfdir}/${SRCNAME}/l3_agent.ini \ " -FILES_${SRCNAME}-metadata-agent = " \ +FILES:${SRCNAME}-metadata-agent = " \ ${bindir}/neutron-metadata-agent \ ${bindir}/neutron-ns-metadata-proxy \ ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ " -FILES_${SRCNAME}-metering-agent = " \ +FILES:${SRCNAME}-metering-agent = " \ ${bindir}/neutron-metering-agent \ ${sysconfdir}/${SRCNAME}/metering_agent.ini \ " -FILES_${SRCNAME}-extra-agents = "${bindir}/*" +FILES:${SRCNAME}-extra-agents = "${bindir}/*" -FILES_${SRCNAME}-doc = "${datadir}/*" +FILES:${SRCNAME}-doc = "${datadir}/*" -FILES_${SRCNAME}-setup = " \ +FILES:${SRCNAME}-setup = " \ ${sysconfdir}/neutron/neutron-init \ " @@ -333,7 +333,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-pbr \ python-paste \ python-pastedeploy \ @@ -384,20 +389,20 @@ RDEPENDS_${PN} += " \ python-os-xenapi \ " -RDEPENDS_${SRCNAME} = "${PN} \ +RDEPENDS:${SRCNAME} = "${PN} \ postgresql postgresql-client python-psycopg2" -RDEPENDS_${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent" -RDEPENDS_${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils" -RDEPENDS_${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch " -RDEPENDS_${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config" -RDEPENDS_${SRCNAME}-linuxbridge-agent = "${SRCNAME}" -RDEPENDS_${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils" -RDEPENDS_${SRCNAME}-metadata-agent = "${SRCNAME}" -RDEPENDS_${SRCNAME}-plugin-ml2 = "${SRCNAME}" -RDEPENDS_${SRCNAME}-setup = "postgresql sudo bash" +RDEPENDS:${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent" +RDEPENDS:${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils" +RDEPENDS:${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch " +RDEPENDS:${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config" +RDEPENDS:${SRCNAME}-linuxbridge-agent = "${SRCNAME}" +RDEPENDS:${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils" +RDEPENDS:${SRCNAME}-metadata-agent = "${SRCNAME}" +RDEPENDS:${SRCNAME}-plugin-ml2 = "${SRCNAME}" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo bash" -RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" +RRECOMMENDS:${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" #INITSCRIPT_PACKAGES = "${SRCNAME}-plugin-openvswitch ${SRCNAME}-l3-agent" #INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent" @@ -412,17 +417,17 @@ SYSTEMD_PACKAGES = " \ ${SRCNAME}-linuxbridge-agent \ ${SRCNAME}-metadata-agent \ " -SYSTEMD_SERVICE_${SRCNAME}-server = "neutron-server.service" -SYSTEMD_SERVICE_${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service" -SYSTEMD_SERVICE_${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service" -SYSTEMD_SERVICE_${SRCNAME}-metadata-agent = "neutron-metadata-agent.service" -SYSTEMD_SERVICE_${SRCNAME}-setup = "neutron-init.service" +SYSTEMD_SERVICE:${SRCNAME}-server = "neutron-server.service" +SYSTEMD_SERVICE:${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service" +SYSTEMD_SERVICE:${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service" +SYSTEMD_SERVICE:${SRCNAME}-metadata-agent = "neutron-metadata-agent.service" +SYSTEMD_SERVICE:${SRCNAME}-setup = "neutron-init.service" # Disable unconfigured services -SYSTEMD_AUTO_ENABLE_${SRCNAME}-server = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-dhcp-agent = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-linuxbridge-agent = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-metadata-agent = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-server = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-dhcp-agent = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-linuxbridge-agent = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-metadata-agent = "disable" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb index f519bf7d..42993e67 100644 --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb @@ -14,7 +14,7 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-pbr \ python-cliff \ python-debtcollector \ @@ -34,7 +34,7 @@ RDEPENDS_${PN} += " \ bash \ " -SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=stable/pike;protocol=https \ file://neutronclient-use-csv-flag-instead-of-json.patch \ file://neutron-api-check.sh \ " @@ -48,13 +48,13 @@ inherit setuptools3 monitor rmargparse PACKAGECONFIG ?= "bash-completion" PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/bash_completion.d install -m 664 ${S}/tools/neutron.bash_completion ${D}/${sysconfdir}/bash_completion.d } PACKAGES =+ "${BPN}-bash-completion" -FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" +FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" MONITOR_CHECKS_${PN} += "\ neutron-api-check.sh \ diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 008a124e..7afe347d 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -11,9 +11,9 @@ DEPENDS = " \ SRCNAME = "nova" -FILESEXTRAPATHS_append := "${THISDIR}/${PN}" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}" -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://neutron-api-set-default-binding-vnic_type.patch \ " @@ -46,8 +46,8 @@ USER = "nova" GROUP = "nova" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${GROUP}" -USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g ${GROUP} ${USER}" +GROUPADD_PARAM:${PN} = "--system ${GROUP}" +USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g ${GROUP} ${USER}" # Need to create the user? PLACEMENT_USER = "placement" @@ -82,7 +82,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-ec2" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { if [ ! -f "${WORKDIR}/nova.conf" ]; then return fi @@ -227,37 +227,37 @@ PACKAGECONFIG ?= "bash-completion" PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion" PACKAGES =+ "${BPN}-bash-completion" -FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" +FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-ec2 = "1" -ALLOW_EMPTY_${SRCNAME}-api = "1" -ALLOW_EMPTY_${SRCNAME}-compute = "1" -ALLOW_EMPTY_${SRCNAME}-controller = "1" -ALLOW_EMPTY_${SRCNAME}-console = "1" -ALLOW_EMPTY_${SRCNAME}-conductor = "1" -ALLOW_EMPTY_${SRCNAME}-network = "1" -ALLOW_EMPTY_${SRCNAME}-novncproxy = "1" -ALLOW_EMPTY_${SRCNAME}-scheduler = "1" -ALLOW_EMPTY_${SRCNAME}-spicehtml5proxy = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-ec2 = "1" +ALLOW_EMPTY:${SRCNAME}-api = "1" +ALLOW_EMPTY:${SRCNAME}-compute = "1" +ALLOW_EMPTY:${SRCNAME}-controller = "1" +ALLOW_EMPTY:${SRCNAME}-console = "1" +ALLOW_EMPTY:${SRCNAME}-conductor = "1" +ALLOW_EMPTY:${SRCNAME}-network = "1" +ALLOW_EMPTY:${SRCNAME}-novncproxy = "1" +ALLOW_EMPTY:${SRCNAME}-scheduler = "1" +ALLOW_EMPTY:${SRCNAME}-spicehtml5proxy = "1" -FILES_${PN} = "${libdir}/*" +FILES:${PN} = "${libdir}/*" -# MAA FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" -FILES_${SRCNAME}-tests = "" +# MAA FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" +FILES:${SRCNAME}-tests = "" -FILES_${SRCNAME}-common = "${bindir}/nova-manage \ +FILES:${SRCNAME}-common = "${bindir}/nova-manage \ ${bindir}/nova-rootwrap \ ${sysconfdir}/${SRCNAME}/* \ ${sysconfdir}/sudoers.d" -FILES_${SRCNAME}-compute = "${bindir}/nova-compute \ +FILES:${SRCNAME}-compute = "${bindir}/nova-compute \ ${sysconfdir}/init.d/nova-compute" -FILES_${SRCNAME}-controller = "${bindir}/* \ +FILES:${SRCNAME}-controller = "${bindir}/* \ ${sysconfdir}/init.d/nova-all " DEPENDS += " \ @@ -265,7 +265,12 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ libvirt \ python-pbr \ python-sqlalchemy \ @@ -328,10 +333,10 @@ RDEPENDS_${PN} += " \ python-pypowervm \ " -RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ +RDEPENDS:${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ iptables curl dnsmasq sudo procps" -RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ +RDEPENDS:${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ ${SRCNAME}-ec2 \ ${SRCNAME}-console \ ${SRCNAME}-novncproxy \ @@ -342,12 +347,12 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ ${SRCNAME}-api \ postgresql postgresql-client python-psycopg2" -RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \ +RDEPENDS:${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \ qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" -RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" -RDEPENDS_${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common" +RDEPENDS:${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" +RDEPENDS:${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common" -RDEPENDS_${SRCNAME}-tests = " \ +RDEPENDS:${SRCNAME}-tests = " \ python-coverage \ bash \ " @@ -365,22 +370,22 @@ SYSTEMD_PACKAGES = " \ ${SRCNAME}-api \ " -SYSTEMD_SERVICE_${SRCNAME}-setup = "nova-init.service" -SYSTEMD_SERVICE_${SRCNAME}-compute = "nova-compute.service" -SYSTEMD_SERVICE_${SRCNAME}-console = "nova-console.service nova-consoleauth.service nova-xvpvncproxy.service" -SYSTEMD_SERVICE_${SRCNAME}-novncproxy = "nova-novncproxy.service" -SYSTEMD_SERVICE_${SRCNAME}-spicehtml5proxy = "nova-spicehtml5proxy.service" -SYSTEMD_SERVICE_${SRCNAME}-network = "nova-network.service" -SYSTEMD_SERVICE_${SRCNAME}-scheduler = "nova-scheduler.service" -SYSTEMD_SERVICE_${SRCNAME}-conductor = "nova-conductor.service" -SYSTEMD_SERVICE_${SRCNAME}-api = "nova-api.service" +SYSTEMD_SERVICE:${SRCNAME}-setup = "nova-init.service" +SYSTEMD_SERVICE:${SRCNAME}-compute = "nova-compute.service" +SYSTEMD_SERVICE:${SRCNAME}-console = "nova-console.service nova-consoleauth.service nova-xvpvncproxy.service" +SYSTEMD_SERVICE:${SRCNAME}-novncproxy = "nova-novncproxy.service" +SYSTEMD_SERVICE:${SRCNAME}-spicehtml5proxy = "nova-spicehtml5proxy.service" +SYSTEMD_SERVICE:${SRCNAME}-network = "nova-network.service" +SYSTEMD_SERVICE:${SRCNAME}-scheduler = "nova-scheduler.service" +SYSTEMD_SERVICE:${SRCNAME}-conductor = "nova-conductor.service" +SYSTEMD_SERVICE:${SRCNAME}-api = "nova-api.service" # Disable services on first boot to avoid having them run when not configured -SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-consoleauth = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-conductor = "disable" -SYSTEMD_AUTO_ENABLE_${SRCNAME}-novncproxy = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-api = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-consoleauth = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-scheduler = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-conductor = "disable" +SYSTEMD_AUTO_ENABLE:${SRCNAME}-novncproxy = "disable" MONITOR_SERVICE_PACKAGES = "${SRCNAME}" MONITOR_SERVICE_${SRCNAME} = "nova-api nova-conductor nova-console nova-scheduler" diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb index f85ae4d3..af9c601f 100644 --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669" SRC_URI = "\ - git://github.com/openstack/python-novaclient.git;branch=stable/pike \ + git://github.com/openstack/python-novaclient.git;branch=stable/pike;protocol=https \ file://nova-api-check.sh \ " @@ -25,7 +25,7 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-pbr \ python-keystoneauth1 \ python-iso8601 \ @@ -42,7 +42,7 @@ RDEPENDS_${PN} += " \ PACKAGECONFIG ?= "bash-completion" PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/bash_completion.d install -m 664 ${S}/tools/nova.bash_completion ${D}/${sysconfdir}/bash_completion.d @@ -53,7 +53,7 @@ do_install_append() { } PACKAGES =+ "${BPN}-bash-completion" -FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" +FILES:${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" MONITOR_CHECKS_${PN} += "\ nova-api-check.sh \ diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python-novnc_git.bb deleted file mode 100644 index 3f36ef57..00000000 --- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "This package contains the core python parts of NoVNC" -HOMEPAGE = "https://github.com/kanaka/noVNC" -SECTION = "devel/python" - -PR = "r0" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6458695fb66dcd893becb5f9f912715e" - -SRCREV = "3b8ec46fd26d644e6edbea4f46e630929297e448" -PV = "0.5.1+git${SRCPV}" - -SRC_URI = "git://github.com/kanaka/noVNC.git \ - file://python-distutils.patch" - -S = "${WORKDIR}/git" - -inherit distutils3 - -DEPENDS += " python-websockify" diff --git a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb index 38351385..e9895678 100644 --- a/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb +++ b/meta-openstack/recipes-devtools/python/python-oauth2_1.5.211.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d98 inherit setuptools3 pypi -RDEPENDS_${PN} += "python-prettytable \ +RDEPENDS:${PN} += "python-prettytable \ python-cmd2 \ python-pyparsing \ python-mccabe \ @@ -17,7 +17,7 @@ RDEPENDS_${PN} += "python-prettytable \ python-pyflakes" -do_install_append() { +do_install:append() { perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO") for f in $perm_files; do chmod 644 "${f}" diff --git a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb index a5be175c..a3b6853b 100644 --- a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb +++ b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" HOMEPAGE = "https://github.com/idan/oauthlib" SECTION = "devel/python" -LICENSE = "Apache-2" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=5ba9ce41463615e082609806255bce1b" SRC_URI[md5sum] = "eb60abdb002b9c08d248707b79a1cc92" @@ -15,11 +15,11 @@ DEPENDS += " \ python-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " -do_install_append() { +do_install:append() { perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt" -o -name "requires.txt"` perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO") for f in $perm_files; do diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb index 57f1175d..b345c396 100644 --- a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI = " \ - git://github.com/openstack/python-openstackclient.git;branch=stable/pike \ + git://github.com/openstack/python-openstackclient.git;branch=stable/pike;protocol=https \ " PV = "3.12.0+git${SRCPV}" @@ -18,7 +18,12 @@ DEPENDS += "\ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-pbr \ python-six \ python-babel \ diff --git a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb deleted file mode 100644 index 9f370bfc..00000000 --- a/meta-openstack/recipes-devtools/python/python-openstacksdk_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Unified SDK for OpenStack" -HOMEPAGE = "https://github.com/openstack/python-openstacksdk" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -SRC_URI = " \ - git://github.com/openstack/python-openstacksdk.git;branch=master \ - " - -PV = "0.9.19+git${SRCPV}" -SRCREV = "bd60aa4a21676b8901691298eb0786fc231f7bff" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += "\ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-jsonpatch \ - python-six \ - python-stevedore \ - python-os-client-config \ - python-keystoneauth1 \ - python-deprecation \ - " diff --git a/meta-openstack/recipes-devtools/python/python-ordereddict.inc b/meta-openstack/recipes-devtools/python/python-ordereddict.inc deleted file mode 100644 index fff4bf6a..00000000 --- a/meta-openstack/recipes-devtools/python/python-ordereddict.inc +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6." -HOMEPAGE = "https://pypi.python.org/pypi/ordereddict" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7f0267460024072a9bbf135ee87a41b8" - -SRC_URI[md5sum] = "a0ed854ee442051b249bfad0f638bbec" -SRC_URI[sha256sum] = "1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pip \ - " diff --git a/meta-openstack/recipes-devtools/python/python-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python-os-brick_git.bb deleted file mode 100644 index 95b7cccb..00000000 --- a/meta-openstack/recipes-devtools/python/python-os-brick_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "OpenStack Cinder brick library for managing local volume attaches" -HOMEPAGE = "https://github.com/openstack/os-brick" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI = "\ - git://github.com/openstack/os-brick.git;branch=stable/pike \ - " - -PV = "1.15.5+git${SRCPV}" -SRCREV = "4090db76673cadb3b8adfceb106069e03414de49" -S = "${WORKDIR}/git" - -inherit setuptools3 - -FILES_${PN} += "${datadir}/etc/*" - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-babel \ - python-eventlet \ - python-oslo.concurrency \ - python-oslo.log \ - python-oslo.serialization \ - python-oslo.i18n \ - python-oslo.privsep \ - python-oslo.service \ - python-oslo.utils \ - python-requests \ - python-retrying \ - python-six \ - python-os-win \ diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config.inc b/meta-openstack/recipes-devtools/python/python-os-client-config.inc index d549ea64..e05746d8 100644 --- a/meta-openstack/recipes-devtools/python/python-os-client-config.inc +++ b/meta-openstack/recipes-devtools/python/python-os-client-config.inc @@ -8,7 +8,7 @@ PV = "1.28.0" SRCREV = "261c05f0057d556a8910457f1e22ca4d81801081" SRCNAME = "os-client-config" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" @@ -20,7 +20,7 @@ DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-pbr \ ${PYTHON_PN}-pyyaml \ ${PYTHON_PN}-appdirs \ diff --git a/meta-openstack/recipes-devtools/python/python-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python-os-vif_git.bb deleted file mode 100644 index fd369125..00000000 --- a/meta-openstack/recipes-devtools/python/python-os-vif_git.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "OpenStack integration library between network and compute providers." -HOMEPAGE = "https://github.com/openstack/os-vif" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI = "\ - git://github.com/openstack/os-vif.git;branch=stable/pike \ - " - -PV = "1.7.0+git${SRCPV}" -SRCREV = "5184b7fc3b8d1689823eacb859087c8a943f9a09" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-netaddr \ - python-oslo.concurrency \ - python-oslo.config \ - python-oslo.log \ - python-oslo.i18n \ - python-oslo.privsep \ - python-oslo.versionedobjects \ - python-six \ - python-stevedore \ - " -
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-os-win_git.bb b/meta-openstack/recipes-devtools/python/python-os-win_git.bb deleted file mode 100644 index 67b63a41..00000000 --- a/meta-openstack/recipes-devtools/python/python-os-win_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Windows / Hyper-V library for OpenStack projects." -HOMEPAGE = "https://github.com/openstack/os-win" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -SRC_URI = "\ - git://github.com/openstack/os-win.git;branch=stable/pike \ - " - -PV = "2.2.0+git${SRCPV}" -SRCREV = "b507ec4e7cb5eead7a008e4d002bc31b85359908" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-babel \ - python-eventlet \ - python-oslo.concurrency \ - python-oslo.config \ - python-oslo.log \ - python-oslo.utils \ - python-oslo.i18n \ - " diff --git a/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb b/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb deleted file mode 100644 index 66850d09..00000000 --- a/meta-openstack/recipes-devtools/python/python-os-xenapi_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "XenAPI library for OpenStack projects." -HOMEPAGE = "https://github.com/openstack/os-xenapi" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRCNAME = "os-xenapi" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master" - -PV = "0.3.1+git${SRCPV}" -SRCREV = "7dce682e2ab0c14236dbc58a38c925536b3b6f8d" -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-babel \ - python-eventlet \ - python-oslo.concurrency \ - python-oslo.log \ - python-oslo.utils \ - python-oslo.i18n \ - python-six \ - " diff --git a/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb b/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb deleted file mode 100644 index 256c286d..00000000 --- a/meta-openstack/recipes-devtools/python/python-osc-lib_1.14.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-osc-lib.inc diff --git a/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb deleted file mode 100644 index f109b8a1..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.cache_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "An oslo.config enabled dogpile.cache" -HOMEPAGE = "https://github.com/openstack/oslo.cache" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -PV = "1.14.0+git${SRCPV}" -SRCREV = "f5b6ddf7d18a7e06e19712ca7a2509d658a08c4d" - -SRCNAME = "oslo.cache" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-dogpile.cache \ - python-six \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.log \ - python-oslo.utils \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb deleted file mode 100644 index 567606c8..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "oslo.concurrency library" -HOMEPAGE = "http://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -PV = "3.21.1+git${SRCPV}" -SRCREV = "8adf9b1f0d69dca7372b967ef4f894487f1a9d64" - -SRCNAME = "oslo.concurrency" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-fasteners \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.utils \ - python-six \ - python-enum34 \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb deleted file mode 100644 index 6a0498c8..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.config_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files." -HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/4.11.1" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" - -PV = "4.11.1+git${SRCPV}" -SRCREV = "fb0738974824af6e1bc7d9fdf32a7c1d3ebf65fb" - -SRCNAME = "oslo.config" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 rmargparse - -DEPENDS += " \ - python-pbr \ - python-pip \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-netaddr \ - python-six \ - python-stevedore \ - python-debtcollector \ - python-oslo.i18n \ - python-rfc3986 \ - python-pyyaml \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb deleted file mode 100644 index a330ed4b..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.db_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "oslo.db library" -HOMEPAGE = "http://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -PV = "4.25.0+git${SRCPV}" -SRCREV = "71607d59ec5c02d7beb5109c500aa9b6a0d9ee2c" - -SRCNAME = "oslo.db" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-six \ - python-alembic \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.utils \ - python-sqlalchemy \ - python-sqlalchemy-migrate \ - python-stevedore \ - python-pbr \ - python-debtcollector \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n.inc b/meta-openstack/recipes-devtools/python/python-oslo.i18n.inc deleted file mode 100644 index 3c0e74c9..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n.inc +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "oslo.i18n library" -HOMEPAGE = "http://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -PV = "3.17.0+git${SRCPV}" -SRCREV = "f2729cd36f8694a6ec53a0e700599ddf4427440d" - -SRCNAME = "oslo.i18n" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - ${PYTHON_PN}-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-babel \ - ${PYTHON_PN}-pbr \ - ${PYTHON_PN}-six \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb deleted file mode 100644 index 1dedfa22..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.23.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "oslo.i18n library" -HOMEPAGE = "http://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -SRCREV = "20bbee510b9714075b7f48f7c3968d7e2bd21a8a" - -SRCNAME = "oslo.i18n" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-babel \ - python-pbr \ - python-six \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb deleted file mode 100644 index 091ae361..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Oslo Log Library" -HOMEPAGE = "https://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -SRCNAME = "oslo.log" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -PV = "3.30.0+git${SRCPV}" -SRCREV = "ad776e84b51223b85b7dfa85a7e77bb2f3848f4b" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-babel \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - bash \ - python-pbr \ - python-six \ - python-oslo.config \ - python-oslo.context \ - python-oslo.i18n \ - python-oslo.utils \ - python-oslo.serialization \ - python-pyinotify \ - python-debtcollector \ - python-dateutil \ - python-monotonic \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb deleted file mode 100644 index 28404e30..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "Oslo Messaging API" -HOMEPAGE = "https://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" - -SRCNAME = "oslo.messaging" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -PV = "5.30.1+git${SRCPV}" -SRCREV = "a07d852b237d229a0f4dd55fd83379c0581e44e9" -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - bash \ - python-pbr \ - python-cachetools \ - python-futurist \ - python-oslo.log \ - python-oslo.utils \ - python-oslo.serialization \ - python-oslo.middleware \ - python-oslo.service \ - python-oslo.i18n \ - python-stevedore \ - python-debtcollector \ - python-monotonic \ - python-six \ - python-webob \ - python-pyyaml \ - python-amqp \ - python-kombu \ - python-pika \ - python-pika-pool \ - python-futures \ - python-tenacity \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb deleted file mode 100644 index b5a68357..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.middleware_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Oslo Middleware library" -HOMEPAGE = "http://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -PV = "3.30.1+git${SRCPV}" -SRCREV = "d9ad4bae1e0d6c43a009d393ac94f7ff50116171" - -SRCNAME = "oslo.middleware" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-jinja2 \ - python-oslo.config \ - python-oslo.context \ - python-oslo.i18n \ - python-oslo.utils \ - python-six \ - python-stevedore \ - python-webob \ - python-debtcollector \ - python-statsd \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb deleted file mode 100644 index 638399a6..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.policy_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Oslo Policy library" -DESCRIPTION = "The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services." -HOMEPAGE = "https://github.com/openstack/oslo.policy" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -PV = "1.25.1+git${SRCPV}" -SRCREV = "cb9ab34cd40a7cd9eff0e40ccc2df4ee88edae4e" - -SRCNAME = "oslo.policy" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ -" - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-oslo.config \ - python-oslo.i18n \ - python-oslo.serialization \ - python-oslo.utils \ - python-six \ - python-pyyaml \ - python-requests \ -" diff --git a/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb deleted file mode 100644 index df0210ad..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.privsep_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "OpenStack library for privilege separation" -HOMEPAGE = "https://github.com/openstack/oslo.privsep" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRCNAME = "oslo.privsep" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -PV = "1.22.1+git${SRCPV}" -SRCREV = "d27bb5371c90e0f8b1bdf1bc24f16e1532b3e595" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pbr \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-oslo.log \ - python-oslo.i18n \ - python-oslo.config \ - python-oslo.utils \ - python-enum34 \ - python-cffi \ - python-eventlet \ - python-greenlet \ - python-msgpack \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb deleted file mode 100644 index 7a6cdd7c..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.reports_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "oslo.reports library" -HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -PV = "1.22.0+git${SRCPV}" -SRCREV = "a837f40bb0c31958d3ce99e2f9a6eb2fe651f4e6" - -SRCNAME = "oslo.reports" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - python-jinja2 \ - python-psutil \ - python-oslo.i18n \ - python-oslo.utils \ - python-oslo.serialization \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb deleted file mode 100644 index 70a56582..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Oslo Rootwrap" -HOMEPAGE = "https://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" - -PV = "5.9.0+git${SRCPV}" -SRCREV = "b7b63e2ecb50ba66a1f152ae6f71dd208326fbee" - -SRCNAME = "oslo.rootwrap" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb deleted file mode 100644 index 392270da..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.service_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "oslo.service library" -HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -PV = "1.25.0" -SRCREV = "0020bef6a503905aca5cdb70aee54e1c5f2ff472" - -SRCNAME = "oslo.service" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-webob \ - python-eventlet \ - python-greenlet \ - python-monotonic \ - python-oslo.utils \ - python-oslo.concurrency \ - python-oslo.config \ - python-oslo.log \ - python-six \ - python-oslo.i18n \ - python-pastedeploy \ - python-paste \ - python-routes \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils.inc b/meta-openstack/recipes-devtools/python/python-oslo.utils.inc deleted file mode 100644 index 8c3022d1..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.utils.inc +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Oslo utils" -HOMEPAGE = "https://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -SRCNAME = "oslo.utils" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -PV = "3.28.0+git${SRCPV}" -SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c" -S = "${WORKDIR}/git" - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - ${PYTHON_PN}-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pbr \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-iso8601 \ - ${PYTHON_PN}-oslo.i18n \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-netaddr \ - ${PYTHON_PN}-netifaces \ - ${PYTHON_PN}-debtcollector \ - ${PYTHON_PN}-pyparsing \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb deleted file mode 100644 index 16a57e18..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.versionedobjects_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "oslo.versionedobjects library" -HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -PV = "1.26.0+git${SRCPV}" -SRCREV = "78cd10662f20c4ae43e20a2dfa844cfd4e5cae26" - -SRCNAME = "oslo.versionedobjects" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-six \ - python-oslo.concurrency \ - python-oslo.config \ - python-oslo.context \ - python-oslo.messaging \ - python-oslo.serialization \ - python-oslo.utils \ - python-oslo.log \ - python-oslo.i18n \ - python-webob \ - python-iso8601 \ - python-netaddr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb deleted file mode 100644 index cd22954c..00000000 --- a/meta-openstack/recipes-devtools/python/python-oslo.vmware_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "oslo.vmware library" -HOMEPAGE = "http://launchpad.net/oslo" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -PV = "2.23.0+git${SRCPV}" -SRCREV = "95a30dfa24d259fe16f0fd43eb1b67b9f3fc0397" - -SRCNAME = "oslo.vmware" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-stevedore \ - python-netaddr \ - python-six \ - python-oslo.i18n \ - python-oslo.utils \ - python-oslo.concurrency \ - python-pyyaml \ - python-lxml \ - python-suds-jurko \ - python-eventlet \ - python-requests \ - python-urllib3 \ - " diff --git a/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb b/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb deleted file mode 100644 index e6fe8656..00000000 --- a/meta-openstack/recipes-devtools/python/python-osprofiler_2.9.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "OpenStack Profiler Library" -HOMEPAGE = "http://www.openstack.org/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5" - -SRC_URI[md5sum] = "75f190b00ac248b3d547b67a480801db" -SRC_URI[sha256sum] = "6915cbf8ac390dc3e125340b0ff368dd53f5889e3d053f9122dd83ba0dd366f7" - -inherit setuptools3 pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - python-oslo.messaging \ - python-oslo.log \ - python-oslo.utils \ - python-webob \ - python-requests \ - python-netaddr \ - python-oslo.concurrency \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pam.inc b/meta-openstack/recipes-devtools/python/python-pam.inc deleted file mode 100644 index 4fddfbc3..00000000 --- a/meta-openstack/recipes-devtools/python/python-pam.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "PAM interface using ctypes" -HOMEPAGE = "http://atlee.ca/software/pam" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;beginline=13;endline=13;md5=8ecc573c355c5eb26b2a4a4f3f62684d" - -SRC_URI[md5sum] = "4c5247af579352bb6882dac64be10a33" -SRC_URI[sha256sum] = "35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-paramiko.inc b/meta-openstack/recipes-devtools/python/python-paramiko.inc deleted file mode 100644 index da47c796..00000000 --- a/meta-openstack/recipes-devtools/python/python-paramiko.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "SSH2 protocol library" -HOMEPAGE = "https://github.com/paramiko/paramiko/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" - -SRC_URI[md5sum] = "f729a45c9122bf975b9177ec5aaa3791" -SRC_URI[sha256sum] = "f4b2edfa0d226b70bd4ca31ea7e389325990283da23465d572ed1f70a7583041" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-pycrypto" diff --git a/meta-openstack/recipes-devtools/python/python-pastedeploy.inc b/meta-openstack/recipes-devtools/python/python-pastedeploy.inc deleted file mode 100644 index db0b4ac2..00000000 --- a/meta-openstack/recipes-devtools/python/python-pastedeploy.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Load, configure, and compose WSGI applications and servers" -HOMEPAGE = "http://pythonpaste.org/deploy/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=d6c3089319205d7e6129f0213b7e949f" - -PYPI_PACKAGE = "PasteDeploy" - -SRC_URI[md5sum] = "6193afccc0982abedb9b7711d0d6adb0" -SRC_URI[sha256sum] = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a" - -inherit pypi - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -RDEPENDS_${PN} += "${PYTHON_PN}-paste" diff --git a/meta-openstack/recipes-devtools/python/python-pathlib.inc b/meta-openstack/recipes-devtools/python/python-pathlib.inc deleted file mode 100644 index 1df01f3f..00000000 --- a/meta-openstack/recipes-devtools/python/python-pathlib.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Object-oriented filesystem paths" -DESCRIPTION = "pathlib offers a set of classes to handle filesystem paths. \ -It offers the following advantages over using string objects: \ -- No more cumbersome use of os and os.path functions. \ -- Embodies the semantics of different path types. \ -- Well-defined semantics, eliminating any warts or ambiguities. \ -" -HOMEPAGE = "https://pypi.python.org/pypi/pathlib" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b6557c860f0fc867aeab30afd649753" - -SRC_URI[md5sum] = "5099ed48be9b1ee29b31c82819240537" -SRC_URI[sha256sum] = "6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ -" - -RDEPENDS_${PN} += " \ -" diff --git a/meta-openstack/recipes-devtools/python/python-pep8.inc b/meta-openstack/recipes-devtools/python/python-pep8.inc deleted file mode 100644 index 959c3d14..00000000 --- a/meta-openstack/recipes-devtools/python/python-pep8.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Python style guide checker" -HOMEPAGE = "https://github.com/dreamhost/cliff" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=d8ebbbe831259ce010179d2f310b0f3e" - -SRC_URI[md5sum] = "a03bb494859e87b42601b61b1b043a0c" -SRC_URI[sha256sum] = "603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f61bed8" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing"
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-pika-pool.inc b/meta-openstack/recipes-devtools/python/python-pika-pool.inc deleted file mode 100644 index c87d7440..00000000 --- a/meta-openstack/recipes-devtools/python/python-pika-pool.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "pools for your pikas" -HOMEPAGE = "https://github.com/bninja/pika-pool" -SECTION = "devel/python" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" - -SRC_URI[md5sum] = "0a3897e991aa3da948e03660313c1980" -SRC_URI[sha256sum] = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pika \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb b/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb deleted file mode 100644 index 049e5213..00000000 --- a/meta-openstack/recipes-devtools/python/python-pika-pool_0.1.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pika-pool.inc diff --git a/meta-openstack/recipes-devtools/python/python-positional.inc b/meta-openstack/recipes-devtools/python/python-positional.inc deleted file mode 100644 index 736e6913..00000000 --- a/meta-openstack/recipes-devtools/python/python-positional.inc +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Library to enforce positional or key-word arguments" -HOMEPAGE = "https://github.com/morganfainberg/positional" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5335066555b14d832335aa4660d6c376" - -SRC_URI[md5sum] = "4afcffd8e2ba733fd7a50f137a2ee893" -SRC_URI[sha256sum] = "cf48ea169f6c39486d5efa0ce7126a97bed979a52af6261cf255a41f9a74453a" - -inherit pypi - -CLEANBROKEN = "1" - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ - " - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-wrapt \ -" diff --git a/meta-openstack/recipes-devtools/python/python-posix-ipc.inc b/meta-openstack/recipes-devtools/python/python-posix-ipc.inc deleted file mode 100644 index 32557f02..00000000 --- a/meta-openstack/recipes-devtools/python/python-posix-ipc.inc +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python" -HOMEPAGE = "http://semanchuk.com/philip/posix_ipc/" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc089fb2f37e90799a54c19a20c9880f" - -PYPI_PACKAGE = "posix_ipc" - -# Archived version so we need to overwrite what the pypi class will derive -PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-${PV}.tar.gz" - -SRC_URI[md5sum] = "c4fd0065244ccb2f59cb8ceedf287cf6" -SRC_URI[sha256sum] = "ff6c9077633fc62a491d6997c43b094d885bb45a7ca1f36c9a0d647c54b74b14" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb deleted file mode 100644 index 9e79b1c6..00000000 --- a/meta-openstack/recipes-devtools/python/python-posix-ipc_1.0.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-posix-ipc.inc diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb index 2c9378a5..94787e6f 100644 --- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb +++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python-PostgreSQL Database Adapter" HOMEPAGE = "http://initd.org/psycopg/" SECTION = "devel/python" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=72bded22a37845c7d9dc3fd39d699a2d" DEPENDS = "postgresql" @@ -12,7 +12,7 @@ SRC_URI += " \ SRC_URI[md5sum] = "9e7d6f695fc7f8d1c42a7905449246c9" SRC_URI[sha256sum] = "eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e" -inherit distutils3 pypi +inherit setuptools3 pypi DEPENDS += " \ postgresql \ diff --git a/meta-openstack/recipes-devtools/python/python-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python-pycadf_git.bb deleted file mode 100644 index 03a105d8..00000000 --- a/meta-openstack/recipes-devtools/python/python-pycadf_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "CADF Library" -HOMEPAGE = "https://launchpad.net/pycadf" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" - -PV = "2.10.0+git${SRCPV}" -SRCREV = "d113c1564d49d93451d9330955e8a42b7db04149" - -SRCNAME = "pycadf" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -FILES_${PN} += "${datadir}/etc/${SRCNAME}/*" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-babel \ - python-iso8601 \ - python-netaddr \ - python-posix-ipc \ - python-pytz \ - python-six \ - python-webob \ - python-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pyflakes.inc b/meta-openstack/recipes-devtools/python/python-pyflakes.inc deleted file mode 100644 index df92d805..00000000 --- a/meta-openstack/recipes-devtools/python/python-pyflakes.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "passive checker of Python programs" -HOMEPAGE = "https://github.com/dreamhost/cliff" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=1815018ebbbfc8659a9df33681a0936e" - -SRC_URI[md5sum] = "ec94ac11cb110e6e72cca23c104b66b1" -SRC_URI[sha256sum] = "dbd2c940a1030a4f811afc1a04017a44011c0cb54f8f384b66aa624097d9b5e3" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing" diff --git a/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb b/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb deleted file mode 100644 index 85cf55a4..00000000 --- a/meta-openstack/recipes-devtools/python/python-pypowervm_1.1.10.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Python binding for the PowerVM REST API" -HOMEPAGE = "https://pypi.python.org/pypi/pypowervm" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI[md5sum] = "54e4dfaa569350254b0a0f4c19686ded" -SRC_URI[sha256sum] = "ab27d4efb59105555b6c9b1fe7792fd895ad9ca893058c39bba4106d6a0ad986" - -inherit setuptools3 pypi - -RDEPENDS_${PN} += " \ - python-lxml \ - python-oslo.concurrency \ - python-oslo.context \ - python-oslo.i18n \ - python-oslo.log \ - python-oslo.utils \ - python-pbr \ - python-pyasn1-modules \ - python-pyasn1 \ - python-pytz \ - python-requests \ - python-six \ - python-futures \ - python-taskflow \ - python-networkx \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb b/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb deleted file mode 100644 index 3e1aa9bb..00000000 --- a/meta-openstack/recipes-devtools/python/python-pysaml2_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Python implementation of SAML Version 2 to be used in a WSGI environment" -HOMEPAGE = "https://github.com/rohe/pysaml2" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e53b335c47f863b1e324a1c9f2e8e3f3" - -PV = "3.0.2+git${SRCPV}" -SRCREV = "248c629aa570b16fdc79c5a5eb2b3c4c0ee52916" - -SRCNAME = "pysaml2" -SRC_URI = "git://github.com/rohe/${SRCNAME}.git" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - " - -RDEPENDS_${PN} += " \ - python-zopeinterface \ - python-repoze.who \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pysnmp.inc b/meta-openstack/recipes-devtools/python/python-pysnmp.inc deleted file mode 100644 index 1a9ca0f7..00000000 --- a/meta-openstack/recipes-devtools/python/python-pysnmp.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "A pure-Python SNMPv1/v2c/v3 library" -HOMEPAGE = "https://pypi.python.org/pypi/pysnmp" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae098273b2cf8b4af164ac20e32bddf7" - -SRC_URI[md5sum] = "1f75d3e392a050e84348904fc1be3212" -SRC_URI[sha256sum] = "c46e65d99a604f690b3d5800e2f6e26e1ed9a3c7f7e17e7b4b4d897150f7077f" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-pycrypto \ - ${PYTHON_PN}-pyasn1 \ -" diff --git a/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb b/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb deleted file mode 100644 index 6b8de00e..00000000 --- a/meta-openstack/recipes-devtools/python/python-pysqlite_2.6.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "DB-API 2.0 interface for SQLite 3.x" -HOMEPAGE = "http://github.com/ghaering/pysqlite" -SECTION = "devel/python" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a85bd923e5c830f8eb89db354ff72f38" - -SRC_URI[md5sum] = "7ff1cedee74646b50117acff87aa1cfa" -SRC_URI[sha256sum] = "fe9c35216bf56c858b34c4b4c8be7e34566ddef29670e5a5b43f9cb8ecfbb28d" - -inherit setuptools3 pypi - -FILES_${PN} += "${datadir}/*" - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pytest-salt.inc b/meta-openstack/recipes-devtools/python/python-pytest-salt.inc deleted file mode 100644 index 1f827634..00000000 --- a/meta-openstack/recipes-devtools/python/python-pytest-salt.inc +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "This pytest plugin will allow the Salt Daemons to be used in tests." -HOMEPAGE = "https://github.com/saltstack/pytest-salt" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -SRCNAME = "pytest-salt" -SRC_URI = "git://github.com/saltstack/${SRCNAME}.git;branch=master" - -SRC_URI[md5sum] = "c598d7db87ea52cdeb067d7596b3b0b1" -SRC_URI[sha256sum] = "7052459cda9fbdbbfff9a25b24243b0b96cf56835a2c41135d754cc5b65e2494" - -SRCREV = "feb5031f80cf84b113ebe69543cdd44b6a373d21" -S = "${WORKDIR}/git" - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-tempdir \ - ${PYTHON_PN}-pytest-helpers-namespace \ - ${PYTHON_PN}-psutil \ - " diff --git a/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb b/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb deleted file mode 100644 index 4e332658..00000000 --- a/meta-openstack/recipes-devtools/python/python-pytest-salt_2017.7.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pytest-salt.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-python-editor_git.bb b/meta-openstack/recipes-devtools/python/python-python-editor_git.bb deleted file mode 100644 index 7529398a..00000000 --- a/meta-openstack/recipes-devtools/python/python-python-editor_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-python-editor.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb index 82a91ba0..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 \ @@ -26,7 +26,7 @@ S = "${WORKDIR}/git" 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}" diff --git a/meta-openstack/recipes-devtools/python/python-rcssmin.inc b/meta-openstack/recipes-devtools/python/python-rcssmin.inc deleted file mode 100644 index c8973959..00000000 --- a/meta-openstack/recipes-devtools/python/python-rcssmin.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "RCSSmin is a CSS minifier." -HOMEPAGE = "http://opensource.perlig.de/rcssmin/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[md5sum] = "467d56503ce386c0b0e52f69ac143a9a" -SRC_URI[sha256sum] = "ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1ba18270" - -inherit pypi - -RDEPENDS_${PN} += " \ - " - -CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python-repoze.lru.inc b/meta-openstack/recipes-devtools/python/python-repoze.lru.inc deleted file mode 100644 index d79e864a..00000000 --- a/meta-openstack/recipes-devtools/python/python-repoze.lru.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A tiny LRU cache implementation and decorator" -DESCRIPTION = "repoze.lru is a LRU (least recently used) cache implementation. \ -Keys and values that are not used frequently will be evicted from the cache faster \ -than keys and values that are used frequently. \ -" -HOMEPAGE = "https://pypi.python.org/pypi/repoze.lru" -SECTION = "devel/python" -LICENSE = "BSD-Modification-copyright" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2c33cdbc6bc9ae6e5d64152fdb754292" - -SRC_URI[md5sum] = "c08cc030387e0b1fc53c5c7d964b35e2" -SRC_URI[sha256sum] = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-requestsexceptions.inc b/meta-openstack/recipes-devtools/python/python-requestsexceptions.inc deleted file mode 100644 index bac99a31..00000000 --- a/meta-openstack/recipes-devtools/python/python-requestsexceptions.inc +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Import exceptions from potentially bundled packages in requests." -HOMEPAGE = "https://www.openstack.org/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" - -SRC_URI[md5sum] = "f43b246ccd7d5b618e6f0dc946a6c3f3" -SRC_URI[sha256sum] = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065" - -inherit pypi - -# conflicting file prevention -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/tests/* -} - -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ - " - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-retrying.inc b/meta-openstack/recipes-devtools/python/python-retrying.inc deleted file mode 100644 index b33dc902..00000000 --- a/meta-openstack/recipes-devtools/python/python-retrying.inc +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Retrying" -HOMEPAGE = "https://github.com/rholder/retrying" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" - -SRC_URI[md5sum] = "2a126aeef8b21324ecdeac15ff46ef17" -SRC_URI[sha256sum] = "08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-routes.inc b/meta-openstack/recipes-devtools/python/python-routes.inc deleted file mode 100644 index 4224552f..00000000 --- a/meta-openstack/recipes-devtools/python/python-routes.inc +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "A Python re-implementation of the Rails routes system." -HOMEPAGE = "http://routes.groovie.org" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=90976c1a0e3029278f882cfe2e84a6ae" - -PV = "2.4.1+git${SRCPV}" -SRCREV = "2dcef8079cf09f427eeb0be62374f6c1a52bf59d" - -SRCNAME = "Routes" -SRC_URI = "git://github.com/bbangert/routes.git" - -S = "${WORKDIR}/git" - -RDEPENDS_${PN} += "${PYTHON_PN}-repoze.lru" diff --git a/meta-openstack/recipes-devtools/python/python-rsa.inc b/meta-openstack/recipes-devtools/python/python-rsa.inc deleted file mode 100644 index ccb65d5a..00000000 --- a/meta-openstack/recipes-devtools/python/python-rsa.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Pure-Python RSA implementation" -AUTHOR = "Sybren A. Stuvel" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" - -inherit pypi - -SRC_URI[md5sum] = "b315f47882c24030ee6b5aad628cccdb" -SRC_URI[sha256sum] = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pyasn1 \ - " diff --git a/meta-openstack/recipes-devtools/python/python-rtslib-fb.inc b/meta-openstack/recipes-devtools/python/python-rtslib-fb.inc deleted file mode 100644 index e14f33d8..00000000 --- a/meta-openstack/recipes-devtools/python/python-rtslib-fb.inc +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "API for Linux kernel SCSI target (aka LIO)" -HOMEPAGE = "http://github.com/agrover/rtslib-fb" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=867c358d5dbac2602d0c0f850f731e62" - -SRC_URI[md5sum] = "4ec7575eb90b7c5a91bbea2962f0e036" -SRC_URI[sha256sum] = "1902c581d6e04b7813f3cd1b11e2abc796205f646c39571cbbb809229fd5553e" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb b/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb deleted file mode 100644 index 571b68c6..00000000 --- a/meta-openstack/recipes-devtools/python/python-rtslib-fb_2.1.51.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-rtslib-fb.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb index 5e781442..8b4fa84a 100644 --- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb @@ -8,20 +8,25 @@ PV = "4.19+git${SRCPV}" SRCREV = "51a1130f6cdcb029a51b6a75d43ac5e4cdde7072" SRCNAME = "ryu" -SRC_URI = "git://github.com/osrg/${SRCNAME}.git" +SRC_URI = "git://github.com/osrg/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" inherit setuptools3 -FILES_${PN} += "${datadir}/etc/${SRCNAME}/*" +FILES:${PN} += "${datadir}/etc/${SRCNAME}/*" DEPENDS += " \ python-pip \ python-pbr \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-eventlet \ python-msgpack \ python-netaddr \ diff --git a/meta-openstack/recipes-devtools/python/python-saharaclient.inc b/meta-openstack/recipes-devtools/python/python-saharaclient.inc deleted file mode 100644 index 91549ae2..00000000 --- a/meta-openstack/recipes-devtools/python/python-saharaclient.inc +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "CLI and python client library for OpenStack Sahara" -HOMEPAGE = "https://launchpad.net/sahara" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - ${PYTHON_PN}-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pbr \ - " - -SRCNAME = "saharaclient" - -SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master" - -PV = "2.3.0+git${SRCPV}" -SRCREV = "3107b452467537f4eef3d9ecfb5e35d110d19662" -S = "${WORKDIR}/git" - diff --git a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb b/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb deleted file mode 100644 index d5d1e3e4..00000000 --- a/meta-openstack/recipes-devtools/python/python-salttesting_2015.2.16.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Common testing tools used in the Salt Stack projects" -HOMEPAGE = "https://github.com/saltstack/salt-testing" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5" -SRCNAME = "salt-testing" - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}" - -SRC_URI = "https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz;downloadfilename=salt-testing-v${PV}.tar.gz \ - file://0001-Add-ptest-output-option-to-test-suite.patch \ - " -SRC_URI[md5sum] = "8ca55a796e9ad7ba72bc143043753ccf" -SRC_URI[sha256sum] = "0ef4be6a8a9b505ae1c328394dfad50493674af6100c7e2c220f374533d86edc" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -RDEPENDS_${PN} = "\ - python-mock \ - python-unittest \ -" - -inherit setuptools3 - diff --git a/meta-openstack/recipes-devtools/python/python-semantic-version.inc b/meta-openstack/recipes-devtools/python/python-semantic-version.inc deleted file mode 100644 index e003c0c6..00000000 --- a/meta-openstack/recipes-devtools/python/python-semantic-version.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "A library which provides a few tools to handle SemVer in Python." -HOMEPAGE = "http://pypi.python.org/pypi/semantic_version" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a7dcaa0740d59f8f13ef05a3d0ed7313" - -PYPI_PACKAGE = "semantic_version" - -SRC_URI[md5sum] = "fd7d5ade76e78d8540b9a4044496a57c" -SRC_URI[sha256sum] = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2" - -#export BUILD_SYS -#export HOST_SYS - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb b/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb deleted file mode 100644 index f4191f55..00000000 --- a/meta-openstack/recipes-devtools/python/python-semantic-version_2.4.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-semantic-version.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-setuptools-git.inc b/meta-openstack/recipes-devtools/python/python-setuptools-git.inc deleted file mode 100644 index 18bc1dc9..00000000 --- a/meta-openstack/recipes-devtools/python/python-setuptools-git.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Plugin for setuptools that enables git integration" -HOMEPAGE = "https://github.com/wichert/setuptools-git" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3775480a712fc46a69647678acb234cb" - -SRC_URI[md5sum] = "40b2ef7687a384ea144503c2e5bc67e2" -SRC_URI[sha256sum] = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445" - -inherit pypi - -# conflicting file prevention -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/site.py* -} -BBCLASSEXTEND = "native" diff --git a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb b/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb deleted file mode 100644 index 5dd6804a..00000000 --- a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-setuptools-git.inc diff --git a/meta-openstack/recipes-devtools/python/python-simplegeneric.inc b/meta-openstack/recipes-devtools/python/python-simplegeneric.inc deleted file mode 100644 index 2cd9fc03..00000000 --- a/meta-openstack/recipes-devtools/python/python-simplegeneric.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Simple generic functions" -HOMEPAGE = "https://pypi.python.org/pypi/simplegeneric/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.txt;md5=2085f2c228ed80422edf70e52e86c34b" - -PYPI_PACKAGE_EXT = "zip" - -SRC_URI[md5sum] = "f9c1fab00fd981be588fc32759f474e3" -SRC_URI[sha256sum] = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-singledispatch.inc b/meta-openstack/recipes-devtools/python/python-singledispatch.inc deleted file mode 100644 index 3ea50268..00000000 --- a/meta-openstack/recipes-devtools/python/python-singledispatch.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "functools.singledispatch from Python 3.4 to Python 2.6" -HOMEPAGE = "https://pypi.python.org/pypi/singledistpatch" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=ee3cd67264adc7eb07981f3644dc17dc" - -SRC_URI[md5sum] = "af2fc6a3d6cc5a02d0bf54d909785fcb" -SRC_URI[sha256sum] = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-statsd.inc b/meta-openstack/recipes-devtools/python/python-statsd.inc deleted file mode 100644 index 33257b90..00000000 --- a/meta-openstack/recipes-devtools/python/python-statsd.inc +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "A simple statsd client." -HOMEPAGE = "https://github.com/jsocol/pystatsd" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4d8aa8ac1dc54b8aee4054bd5e5c61bd" - -inherit pypi - -SRC_URI[md5sum] = "b397ccf880f37cf099e775907ebf7a46" -SRC_URI[sha256sum] = "e3e6db4c246f7c59003e51c9720a51a7f39a396541cb9b147ff4b14d15b5dd1f" - -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-suds-jurko.inc b/meta-openstack/recipes-devtools/python/python-suds-jurko.inc deleted file mode 100644 index 579212ae..00000000 --- a/meta-openstack/recipes-devtools/python/python-suds-jurko.inc +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Lightweight SOAP client (Jurko's fork)" -HOMEPAGE = "https://bitbucket.org/jurko/suds" -SECTION = "devel/python" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=847e96bce86d8774f491a92924343a29" - -PYPI_PACKAGE_EXT = "tar.bz2" - -SRC_URI[md5sum] = "1309e9bc2454aa3434041f0a24ae4e11" -SRC_URI[sha256sum] = "29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -RDEPENDS_${PN} += " \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb b/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb deleted file mode 100644 index d230c8de..00000000 --- a/meta-openstack/recipes-devtools/python/python-suds-jurko_0.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools3 -require python-suds-jurko.inc - diff --git a/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb b/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb index c1e79a03..3ff818c1 100644 --- a/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb +++ b/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Lightweight SOAP client" HOMEPAGE = "https://fedorahosted.org/suds/" SECTION = "devel/python" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=847e96bce86d8774f491a92924343a29" PR = "r0" diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index 87f7f049..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 \ @@ -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" diff --git a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb deleted file mode 100644 index 7a99e8a5..00000000 --- a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Client library for OpenStack Object Storage API" -HOMEPAGE = "https://github.com/openstack/python-swiftclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -PR = "r0" -SRCNAME = "swiftclient" - -SRC_URI = "git://github.com/openstack/python-swiftclient.git;branch=master" - -PV = "3.8.1+git${SRCPV}" -SRCREV = "72b90fed4c62cf75497a7d66714f5fb0aa91f18b" -S = "${WORKDIR}/git" - -inherit setuptools3 python3-dir - -do_install_append() { - cp -r tests ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/ -} - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " \ - python-simplejson \ - python-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-sysv-ipc.inc b/meta-openstack/recipes-devtools/python/python-sysv-ipc.inc deleted file mode 100644 index 47ecf2cd..00000000 --- a/meta-openstack/recipes-devtools/python/python-sysv-ipc.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "System V IPC primitives (semaphores, shared memory and message queues) for Python" -HOMEPAGE = "http://semanchuk.com/philip/sysv_ipc/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9d6e34e7b47096d7c19c1e3be707374e" - -PYPI_PACKAGE = "sysv_ipc" - -SRC_URI[md5sum] = "c6cf5b4aa7cd3e07fd4b5661530eca8c" -SRC_URI[sha256sum] = "0af73375a85c5d9d487c2f14f208812600bd81e4046437ebaf55746b3aade00e" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb b/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb deleted file mode 100644 index 0e3dcd1f..00000000 --- a/meta-openstack/recipes-devtools/python/python-sysv-ipc_0.6.8.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-sysv-ipc.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python-taskflow_git.bb deleted file mode 100644 index 76371a87..00000000 --- a/meta-openstack/recipes-devtools/python/python-taskflow_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "A library to complete workflows/tasks in HA manner" -HOMEPAGE = "https://wiki.openstack.org/wiki/TaskFlow" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" - -SRC_URI = "\ - git://git.openstack.org/openstack/taskflow.git;branch=stable/pike \ - " - -PV="2.14.1+git${SRCPV}" -SRCREV="ed867c4fd17e4102a133c313a13af37baccf14a4" -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - python-enum34 \ - python-futurist \ - python-fasteners \ - python-networkx \ - python-contextlib2 \ - python-stevedore \ - python-futures \ - python-jsonschema \ - python-automaton \ - python-oslo.utils \ - python-oslo.serialization \ - python-tenacity \ - python-cachetools \ - python-debtcollector \ - " -
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-tempita.inc b/meta-openstack/recipes-devtools/python/python-tempita.inc deleted file mode 100644 index c511c128..00000000 --- a/meta-openstack/recipes-devtools/python/python-tempita.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "A very small text templating language" -HOMEPAGE = "http://pythonpaste.org/tempita/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://setup.py;beginline=33;endline=33;md5=2d33c00f47720c7e35e1fdb4b9fab027" - -PYPI_PACKAGE = "Tempita" - -SRC_URI[md5sum] = "365c3b4f36435e2178902d5619301140" -SRC_URI[sha256sum] = "38392bb708a10128419f75fa9120a6d2c8d137013b353968e5008a77a5c7a2ca" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-testrepository.inc b/meta-openstack/recipes-devtools/python/python-testrepository.inc deleted file mode 100644 index 673141d5..00000000 --- a/meta-openstack/recipes-devtools/python/python-testrepository.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A repository of test results" -HOMEPAGE = "https://pypi.python.org/pypi/testrepository/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=f19071a777e237c55ec3ab83284b31b8" - -SRC_URI[md5sum] = "f648b0aceeca4fcd5f8a62eeedea289b" -SRC_URI[sha256sum] = "752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-subunit \ - ${PYTHON_PN}-extras \ -" - -CLEANBROKEN = "1" - diff --git a/meta-openstack/recipes-devtools/python/python-testresources.inc b/meta-openstack/recipes-devtools/python/python-testresources.inc deleted file mode 100644 index 67ad6c4d..00000000 --- a/meta-openstack/recipes-devtools/python/python-testresources.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Testresources, a pyunit extension for managing expensive test resources" -HOMEPAGE = "https://pypi.python.org/pypi/testtools/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README;md5=038679cd2cf27bb2acc70257bfee0f41" - -SRC_URI[md5sum] = "db2e774be2a6f5754cbbf4c537f823d0" -SRC_URI[sha256sum] = "ad0a117383dd463827b199eaa92829b4d6a3147fbd97459820df53bae81d7231" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-testscenarios.inc b/meta-openstack/recipes-devtools/python/python-testscenarios.inc deleted file mode 100644 index 1008f113..00000000 --- a/meta-openstack/recipes-devtools/python/python-testscenarios.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "testscenarios: a pyunit extension for dependency injection" -HOMEPAGE = "https://pypi.python.org/pypi/testscenarios" -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://BSD;md5=0805e4f024d089a52dca0671a65b8b66" - -SRC_URI[md5sum] = "859073d9e7b049aee2e6704c51f6001a" -SRC_URI[sha256sum] = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6" - -inherit pypi - -DEPENDS += "\ - ${PYTHON_PN}-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ - " - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-testtools \ - ${PYTHON_PN}-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-testtools.inc b/meta-openstack/recipes-devtools/python/python-testtools.inc deleted file mode 100644 index 7cc63f42..00000000 --- a/meta-openstack/recipes-devtools/python/python-testtools.inc +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Extensions to the Python standard library unit testing framework" -HOMEPAGE = "https://pypi.python.org/pypi/testtools/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" - -SRC_URI[md5sum] = "0f0feb915497816cb99e39437494217e" -SRC_URI[sha256sum] = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559" - -inherit pypi -DEPENDS += " \ - ${PYTHON_PN}-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - ${PYTHON_PN}-pbr-native \ - " - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-extras \ - ${PYTHON_PN}-pbr \ - " diff --git a/meta-openstack/recipes-devtools/python/python-thrift.inc b/meta-openstack/recipes-devtools/python/python-thrift.inc deleted file mode 100644 index 019d7c81..00000000 --- a/meta-openstack/recipes-devtools/python/python-thrift.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python bindings for the Apache Thrift RPC system" -HOMEPAGE = "https://pypi.python.org/pypi/amqp/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=df17a59cc9e1327ec49c2285e13ac477" - -SRC_URI[md5sum] = "91f1c224c46a257bb428431943387dfd" -SRC_URI[sha256sum] = "08f665e4b033c9d2d0b6174d869273104362c80e77ee4c01054a74141e378afa" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb b/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb deleted file mode 100644 index 9da58133..00000000 --- a/meta-openstack/recipes-devtools/python/python-tinyrpc_0.6.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A small, modular, transport and protocol neutral \ -RPC library that, among other things, supports JSON-RPC and zmq." -HOMEPAGE = "http://github.com/mbr/tinyrpc" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI[md5sum] = "2663568ba3e1793da7b21003f0847fdd" -SRC_URI[sha256sum] = "b4d64227f023f1f0736ef137bd4c901c7652563e62c7a20329222c3a0b14d84f" - -inherit setuptools3 pypi - -RDEPENDS_${PN} += " \ - python-six \ - python-gevent \ - python-requests \ - python-websocket-client \ - python-jsonext \ - python-gevent-websocket \ - python-werkzeug \ - python-pyzmq \ - " diff --git a/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb b/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb deleted file mode 100644 index 1443b1bd..00000000 --- a/meta-openstack/recipes-devtools/python/python-tooz_1.48.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Coordination library for distributed systems." -HOMEPAGE = "https://pypi.python.org/pypi/tooz" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -SRC_URI[md5sum] = "8b39e07002f21c15d2a463b63d8a2952" -SRC_URI[sha256sum] = "c1b17935207e9c4809feff91b679883928aa5bd3fce75e09b4945c261b513e60" - -inherit setuptools3 pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-stevedore \ - python-six \ - python-voluptuous \ - python-msgpack \ - python-fasteners \ - python-tenacity \ - python-futures \ - python-futurist \ - python-oslo.utils \ - python-oslo.serialization \ - " diff --git a/meta-openstack/recipes-devtools/python/python-tox.inc b/meta-openstack/recipes-devtools/python/python-tox.inc index 66b13553..c483424a 100644 --- a/meta-openstack/recipes-devtools/python/python-tox.inc +++ b/meta-openstack/recipes-devtools/python/python-tox.inc @@ -10,13 +10,13 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-virtualenv \ ${PYTHON_PN}-py \ ${PYTHON_PN}-pytest \ " -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/${SRCNAME} cp ${S}/tox.ini ${D}/${sysconfdir}/${SRCNAME} @@ -26,4 +26,4 @@ do_install_append() { ln -s ${PYTHON_SITEPACKAGES_DIR}/tox ${D}/${sysconfdir}/${SRCNAME}/tox } -FILES_${PN} += "${sysconfdir}/${SRCNAME}/*" +FILES:${PN} += "${sysconfdir}/${SRCNAME}/*" diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index f1b6aacc..b9045e2c 100755 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "trove" -SRC_URI = "git://github.com/openstack/trove.git;branch=master \ +SRC_URI = "git://github.com/openstack/trove.git;branch=master;protocol=https \ file://trove-init \ " @@ -36,7 +36,7 @@ python () { } SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} TROVE_CONF_DIR=${D}${sysconfdir}/${SRCNAME} TROVE_LOG_DIR="/var/log/${SRCNAME}" @@ -144,7 +144,7 @@ do_install_append() { } -pkg_postinst_${SRCNAME}-setup () { +pkg_postinst:${SRCNAME}-setup () { # python-trove-setup postinst start if [ -z "$D" ]; then source /etc/nova/openrc @@ -173,8 +173,8 @@ pkg_postinst_${SRCNAME}-setup () { USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system trove" -USERADD_PARAM_${PN} = "--system --home /var/lib/trove -g trove \ +GROUPADD_PARAM:${PN} = "--system trove" +USERADD_PARAM:${PN} = "--system --home /var/lib/trove -g trove \ --no-create-home --shell /bin/false trove" PROVIDES += " \ @@ -191,42 +191,42 @@ PACKAGES += " \ ${SRCNAME}-taskmanager \ " -PACKAGES_prepend = " \ +PACKAGES:prepend = " \ ${SRCNAME}-tests \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/* \ " -FILES_${SRCNAME}-tests = " \ +FILES:${SRCNAME}-tests = " \ ${libdir}/python*/site-packages/${SRCNAME}/tests/* \ " -ALLOW_EMPTY_${SRCNAME} = "1" -FILES_${SRCNAME} = " \ +ALLOW_EMPTY:${SRCNAME} = "1" +FILES:${SRCNAME} = " \ " -FILES_${SRCNAME}-api = " \ +FILES:${SRCNAME}-api = " \ ${sysconfdir}/init.d/trove-api \ " -ALLOW_EMPTY_${SRCNAME}-api = "1" +ALLOW_EMPTY:${SRCNAME}-api = "1" -FILES_${SRCNAME}-bin = " \ +FILES:${SRCNAME}-bin = " \ ${bindir}/* \ " -FILES_${SRCNAME}-conductor = " \ +FILES:${SRCNAME}-conductor = " \ ${sysconfdir}/init.d/trove-conductor \ " -ALLOW_EMPTY_${SRCNAME}-conductor = "1" +ALLOW_EMPTY:${SRCNAME}-conductor = "1" -FILES_${SRCNAME}-taskmanager = " \ +FILES:${SRCNAME}-taskmanager = " \ ${sysconfdir}/init.d/trove-taskmanager \ " -ALLOW_EMPTY_${SRCNAME}-taskmanager = "1" +ALLOW_EMPTY:${SRCNAME}-taskmanager = "1" -FILES_${SRCNAME}-setup = " \ +FILES:${SRCNAME}-setup = " \ ${localstatedir}/* \ ${sysconfdir}/${SRCNAME}/* \ " @@ -238,7 +238,12 @@ DEPENDS += " \ python-pip \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +RDEPENDS:${PN} += " \ python-babel \ python-cinderclient \ python-eventlet \ @@ -268,7 +273,7 @@ RDEPENDS_${PN} += " \ uwsgi \ " -RDEPENDS_${SRCNAME} = " \ +RDEPENDS:${SRCNAME} = " \ ${PN} \ ${SRCNAME}-api \ ${SRCNAME}-bin \ @@ -278,19 +283,19 @@ RDEPENDS_${SRCNAME} = " \ troveclient \ " -RDEPENDS_${SRCNAME}-api = " \ +RDEPENDS:${SRCNAME}-api = " \ ${SRCNAME}-setup \ " -RDEPENDS_${SRCNAME}-bin = " \ +RDEPENDS:${SRCNAME}-bin = " \ ${PN} \ " -RDEPENDS_${SRCNAME}-conductor = " \ +RDEPENDS:${SRCNAME}-conductor = " \ ${SRCNAME}-setup \ " -RDEPENDS_${SRCNAME}-setup = " \ +RDEPENDS:${SRCNAME}-setup = " \ ${PN} \ ${SRCNAME}-bin \ keystone-setup \ @@ -301,11 +306,11 @@ RDEPENDS_${SRCNAME}-setup = " \ sudo \ " -RDEPENDS_${SRCNAME}-taskmanager = " \ +RDEPENDS:${SRCNAME}-taskmanager = " \ ${SRCNAME}-setup \ " -RDEPENDS_${SRCNAME}-tests += " \ +RDEPENDS:${SRCNAME}-tests += " \ python-mock \ python-pexpect \ " @@ -313,11 +318,11 @@ RDEPENDS_${SRCNAME}-tests += " \ INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-conductor ${SRCNAME}-taskmanager" -INITSCRIPT_NAME_${SRCNAME}-api = "trove-api" -INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-api = "trove-api" +INITSCRIPT_PARAMS:${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-conductor = "trove-conductor" -INITSCRIPT_PARAMS_${SRCNAME}-conductor = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-conductor = "trove-conductor" +INITSCRIPT_PARAMS:${SRCNAME}-conductor = "${OS_DEFAULT_INITSCRIPT_PARAMS}" -INITSCRIPT_NAME_${SRCNAME}-taskmanager = "trove-taskmanager" -INITSCRIPT_PARAMS_${SRCNAME}-taskmanager = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_NAME:${SRCNAME}-taskmanager = "trove-taskmanager" +INITSCRIPT_PARAMS:${SRCNAME}-taskmanager = "${OS_DEFAULT_INITSCRIPT_PARAMS}" diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb index 64ab1669..a9d20edf 100644 --- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "troveclient" SRC_URI = "\ - git://github.com/openstack/python-troveclient.git;branch=master \ + git://github.com/openstack/python-troveclient.git;branch=master;protocol=https \ " PV = "3.0.0+git${SRCPV}" @@ -29,23 +29,23 @@ PACKAGES += " \ ${SRCNAME}-bin \ " -PACKAGES_prepend = " \ +PACKAGES:prepend = " \ ${SRCNAME}-tests \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/* \ " -FILES_${SRCNAME}-tests = " \ +FILES:${SRCNAME}-tests = " \ ${libdir}/python*/site-packages/${SRCNAME}/tests/* \ " -ALLOW_EMPTY_${SRCNAME} = "1" -FILES_${SRCNAME} = " \ +ALLOW_EMPTY:${SRCNAME} = "1" +FILES:${SRCNAME} = " \ " -FILES_${SRCNAME}-bin = " \ +FILES:${SRCNAME}-bin = " \ ${bindir}/* \ " @@ -54,7 +54,7 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python-pbr \ python-prettytable \ python-requests \ @@ -65,9 +65,9 @@ RDEPENDS_${PN} += " \ python-keystoneclient \ " -RDEPENDS_${SRCNAME}-tests += "python-mock" +RDEPENDS:${SRCNAME}-tests += "python-mock" -RDEPENDS_${SRCNAME} += " \ +RDEPENDS:${SRCNAME} += " \ ${PN} \ ${SRCNAME}-bin \ " @@ -77,6 +77,6 @@ DEPENDS += " \ python-pbr-native \ " -RDEPENDS_${SRCNAME}-bin += " \ +RDEPENDS:${SRCNAME}-bin += " \ ${PN} \ " diff --git a/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb b/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb deleted file mode 100644 index 548543ea..00000000 --- a/meta-openstack/recipes-devtools/python/python-unicodecsv_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Python2's stdlib csv module replacement with unicode support" -HOMEPAGE = "https://github.com/jdunck/python-unicodecsv" -SECTION = "devel/python" -LICENSE = "BSD" - -PV = "0.14.1+git${SRCPV}" -SRCREV = "4563e33ce322f5e2dea41e76cb33dc0e008ad341" - -SRCNAME = "unicodecsv" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=e71cdeaa2d2d59b225b8dfb9363fa590" -SRC_URI = "git://github.com/jdunck/${BPN}.git" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -DEPENDS += " \ - python-pbr \ - " - -RDEPENDS_${PN} += " \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-uritemplate.inc b/meta-openstack/recipes-devtools/python/python-uritemplate.inc deleted file mode 100644 index e0c53e77..00000000 --- a/meta-openstack/recipes-devtools/python/python-uritemplate.inc +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Simple python library to deal with URI Templates." -AUTHOR = "Ian Cordasco" -LICENSE = "Apache-2.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2e14cc8f5f696fd9d47092e992265c1" - -inherit pypi - -SRC_URI[md5sum] = "1ec31e0d8a2eec72357b2cef4bce5945" -SRC_URI[sha256sum] = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d" diff --git a/meta-openstack/recipes-devtools/python/python-virtualenv.inc b/meta-openstack/recipes-devtools/python/python-virtualenv.inc index 79b9451c..e24cda1f 100644 --- a/meta-openstack/recipes-devtools/python/python-virtualenv.inc +++ b/meta-openstack/recipes-devtools/python/python-virtualenv.inc @@ -13,6 +13,6 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-dateutil \ " diff --git a/meta-openstack/recipes-devtools/python/python-warlock.inc b/meta-openstack/recipes-devtools/python/python-warlock.inc deleted file mode 100644 index d8a16b11..00000000 --- a/meta-openstack/recipes-devtools/python/python-warlock.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Build self-validating python objects using JSON schemas" -HOMEPAGE = "http://github.com/bcwaldon/warlock" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS += "python-jsonschema python-jsonpatch" - -SRC_URI[md5sum] = "746aba989d97762948e5fca6601f283f" -SRC_URI[sha256sum] = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090" - -inherit pypi - -RDEPENDS_${PN} += "${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-jsonpatch \ - " - diff --git a/meta-openstack/recipes-devtools/python/python-weakrefmethod.inc b/meta-openstack/recipes-devtools/python/python-weakrefmethod.inc deleted file mode 100644 index 28aee864..00000000 --- a/meta-openstack/recipes-devtools/python/python-weakrefmethod.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "A WeakMethod class for storing bound methods using weak references." -HOMEPAGE = "https://github.com/twang817/weakrefmethod" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" - -SRC_URI[md5sum] = "39e7450191dea0b17a646b929784ac6f" -SRC_URI[sha256sum] = "37bc1fbb5575acf82172d4eb7b6fc4412d77d5a1d70dff2c1f8a4574301cda66" - -inherit pypi diff --git a/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb b/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb deleted file mode 100644 index c51a79b6..00000000 --- a/meta-openstack/recipes-devtools/python/python-websockify_0.8.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "WebSockets support for any application/server" -HOMEPAGE = "https://github.com/kanaka/websockify" -SECTION = "devel/python" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a3b5f97c9d64189899b91b3728bfd774" - -SRC_URI[md5sum] = "8fa547ca4de84a96aa3472d55fbcdd59" -SRC_URI[sha256sum] = "547d3d98c5081f2dc2872a2e4a3aef33e0ee5141d5f6209204aab2f4a41548d2" - -inherit setuptools3 pypi - -RDEPENDS_${PN} += "gmp" - -FILES_${PN} += "${datadir}/*" diff --git a/meta-openstack/recipes-devtools/python/python-webtest.inc b/meta-openstack/recipes-devtools/python/python-webtest.inc deleted file mode 100644 index d4e9e079..00000000 --- a/meta-openstack/recipes-devtools/python/python-webtest.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Helper to test WSGI applications" -HOMEPAGE = "https://pypi.python.org/pypi/WebTest/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=e3e00192f000e33de99fd5a3cb32a8fc" - -PYPI_PACKAGE = "WebTest" - -RDEPENDS_${PN} += "${PYTHON_PN}-beautifulsoup4" - -SRC_URI[md5sum] = "dd0385c725b85ac1e8079f38d2acd7b1" -SRC_URI[sha256sum] = "41348efe4323a647a239c31cde84e5e440d726ca4f449859264e538d39037fd0" diff --git a/meta-openstack/recipes-devtools/python/python-wsgiref.inc b/meta-openstack/recipes-devtools/python/python-wsgiref.inc deleted file mode 100644 index 1449bea0..00000000 --- a/meta-openstack/recipes-devtools/python/python-wsgiref.inc +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "WSGI (PEP 333) Reference Library" -HOMEPAGE = "http://cheeseshop.python.org/pypi/wsgiref" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fe761dfec1d54629c6b9a3bbc7b1baf5" - -# Archived version so we need to overwrite what the pypi class will derive -PYPI_SRC_URI = "https://pypi.python.org/packages/source/w/wsgiref/wsgiref-${PV}.zip" - -SRC_URI[md5sum] = "29b146e6ebd0f9fb119fe321f7bcf6cb" -SRC_URI[sha256sum] = "c7e610c800957046c04c8014aab8cce8f0b9f0495c8cd349e57c1f7cabf40e79" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb b/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb deleted file mode 100644 index d349a48a..00000000 --- a/meta-openstack/recipes-devtools/python/python-xattr_0.6.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python wrapper for extended filesystem attributes" -HOMEPAGE = "http://github.com/xattr/xattr" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ebb582f22ddff5dcb0bc33d04f7cbb8" - -SRC_URI[md5sum] = "1bef31afb7038800f8d5cfa2f4562b37" -SRC_URI[sha256sum] = "f9dcebc99555634b697fa3dad8ea3047deb389c6f1928d347a0c49277a5c0e9e" - -inherit setuptools3 pypi
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb deleted file mode 100644 index 622f1528..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap_2.2.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-bootstrap.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies.inc b/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies.inc deleted file mode 100644 index bc3923bb..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Angular-Cookies JavaScript library packaged for setuptools" -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Cookies" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=70856f1d03d62a3e0c0cb1b7f8c7fd00" - -PYPI_PACKAGE = "XStatic-Angular-Cookies" - -SRC_URI[md5sum] = "a67066fac5dfe9774ab163d44e5a896a" -SRC_URI[sha256sum] = "c8fc1a52549c601809fc9f25144e4fd346820412b6430e89256e7ec71fce0b4c" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb deleted file mode 100644 index ee9591a8..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-cookies_1.2.1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-cookies.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload.inc b/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload.inc deleted file mode 100644 index a845453b..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Angular Fileupload packaged for setuptools (easy_install) / pip." -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-FileUpload" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e634b82c14383ecefd736caa40ed2222" - -PYPI_PACKAGE = "XStatic-Angular-FileUpload" - -SRC_URI[md5sum] = "1cf48c0204783da2f71efe79039a8468" -SRC_URI[sha256sum] = "68e66efc4f2ed81438553a54646d5cc67487b05764c0003ff25ae5beb8dae21f" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb deleted file mode 100644 index 644a6312..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-fileupload_12.0.4.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-fileupload.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb deleted file mode 100644 index 48b75aac..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext_2.3.8.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-gettext.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop.inc b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop.inc deleted file mode 100644 index 90331a9e..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop.inc +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "IrDragNDrop javascript library packaged for setuptools" -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-IrDragNDrop" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9acc2dfc3a0345c175df08104bd22298" - -PYPI_PACKAGE = "XStatic-Angular-IrDragNDrop" - -SRC_URI[md5sum] = "6ea8809bae94014aef699d58836dba84" -SRC_URI[sha256sum] = "5595f4a98ac8f8468f7e56dc916e10c0fc5f0197567899a75755f99fe8b5bd6d" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb deleted file mode 100644 index 72c8781e..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-irdragndrop_1.0.2.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-irdragndrop.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form.inc b/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form.inc deleted file mode 100644 index 7bfa9578..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Angular Schema Form packaged for setuptools (easy_install) / pip." -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Schema-Form" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0e4430cb0dfdb98d3008c66d8339f31a" - -PYPI_PACKAGE = "XStatic-Angular-Schema-Form" - -SRC_URI[md5sum] = "d0faab81c36f4cfc03e092fedc30018d" -SRC_URI[sha256sum] = "7c08634901751267fe26d266fc027cf6ed2e5f422696985cec750594b3f4e300" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb deleted file mode 100644 index eae97b28..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-schema-form_0.8.13.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-schema-form.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb deleted file mode 100644 index 9e9db897..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker_1.3.1.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-bootstrap-datepicker.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb deleted file mode 100644 index 20eab88c..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss_3.3.7.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-bootstrap-scss.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch.inc b/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch.inc deleted file mode 100644 index 60b978a8..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch.inc +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "bootswatch javascript library packaged for setuptools (easy_install) / pip." -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-bootswatch" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -PYPI_PACKAGE = "XStatic-bootswatch" - -SRC_URI[md5sum] = "422f09e076ff1741b76a9f7554ceca32" -SRC_URI[sha256sum] = "93ee5863c1ec07212fe12ae137a10708b4102720391d460f061dd3f441ba3b6e" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb deleted file mode 100644 index 5a7d5f8f..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootswatch_3.3.7.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-bootswatch.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-d3.inc b/meta-openstack/recipes-devtools/python/python-xstatic-d3.inc deleted file mode 100644 index 0577db59..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-d3.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "D3 JavaScript library packaged for setuptools" -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-D3" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -PYPI_PACKAGE = "XStatic-D3" - -SRC_URI[md5sum] = "2729f32f218b122999c26daeaf67a0a8" -SRC_URI[sha256sum] = "176e93eee7192e07fc54334ddb1a6b64fcfc8cde6abb23f65727856bb9dd1829" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb deleted file mode 100644 index 242175f1..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-d3_3.5.17.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-d3.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome.inc b/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome.inc deleted file mode 100644 index 57fae232..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Font Awesome icons packaged for setuptools (easy_install) / pip." -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Font-Awesome" -SECTION = "devel/python" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/OFL-1.1;md5=fac3a519e5e9eb96316656e0ca4f2b90" - -PYPI_PACKAGE = "XStatic-Font-Awesome" - -SRC_URI[md5sum] = "141a0e9a7e21e82f922573a00ae0c166" -SRC_URI[sha256sum] = "e01fb480caaa7c7963dcb3328a4700e631bef6070db0e8b685816d220e685f6c" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb deleted file mode 100644 index b2998f6e..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-font-awesome.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb b/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb deleted file mode 100644 index bdd3c27c..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-hogan_2.0.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-hogan.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate.inc b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate.inc deleted file mode 100644 index b5c1332a..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "JQuery-Migrate JavaScript library packaged for setuptools" -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery-Migrate" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=2bbd78dd61f7b4f2fb6b3e31e4d7a26b" - -PYPI_PACKAGE = "XStatic-JQuery-Migrate" - -SRC_URI[md5sum] = "2dd39f9d6351aeaf129b33d4134ac6a7" -SRC_URI[sha256sum] = "e2959b3df49afdddb00d36b74cca727a91b994b9f4edb993d7264731a750900e" - -inherit pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb deleted file mode 100644 index 2dab32f9..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-migrate_1.2.1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-jquery-migrate.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb deleted file mode 100644 index ca2d4471..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery-ui_1.11.0.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "%DESCRIPTION%" -HOMEPAGE = "%URL%" -SECTION = "devel/python" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=55ac15f231e5629fb6576e349c318199" - -PYPI_PACKAGE = "XStatic-jquery-ui" - -SRC_URI[md5sum] = "03d8ea7a0dab29d548e7bc195703b04f" -SRC_URI[sha256sum] = "099b1836eb0d91b8dc98f5b8a6b856a2631d43af0d47f33ef90ee72ed37bda58" - -inherit setuptools3 pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb deleted file mode 100644 index 295b3a40..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.quicksearch_2.0.3.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "JQuery.quicksearch JavaScript library packaged for setuptools3 " -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery.quicksearch" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=503c3857973c52f673691b910068e2d0" - -PYPI_PACKAGE = "XStatic-JQuery.quicksearch" - -SRC_URI[md5sum] = "0dc4bd1882cf35dc7b19a236ba09b89d" -SRC_URI[sha256sum] = "1271571b420417add56c274fd935e81bfc79e0d54a03559d6ba5ef369f358477" - -inherit setuptools3 pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb deleted file mode 100644 index 7ede3bff..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.tablesorter_2.14.5.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "JQuery.TableSorter JavaScript library packaged for setuptools3" -HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery.TableSorter" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a9ef3319547ce4563718db4b4657fb94" - -PYPI_PACKAGE = "XStatic-JQuery.TableSorter" - -SRC_URI[md5sum] = "fc05a6731b6ac3f6489b893f96a5d29a" -SRC_URI[sha256sum] = "3ba24aecd9a3dc71a79dd4096fa5a8a041c3a7b892c61d05e6e46de0605070f0" - -inherit setuptools3 pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb b/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb deleted file mode 100644 index efbb9e37..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery_1.10.2.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-jquery.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface.inc b/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface.inc deleted file mode 100644 index d11d0a1a..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface.inc +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A simple package providing the Roboto fontface." -HOMEPAGE = "https://github.com/choffmeister/roboto-fontface-bower" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -PYPI_PACKAGE = "XStatic-roboto-fontface" - -SRC_URI[md5sum] = "32273ba68fa063623461db0b0767524f" -SRC_URI[sha256sum] = "6d272df58e20eec3a15bca279163f38614c7074e2fecb537a58b29d109e83f62" - -inherit pypi - -DEPENDS += " \ - ${PYTHON_PN}-pip \ - " - -RDEPENDS_${PN} += " \ - " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb b/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb deleted file mode 100644 index e05e35ed..00000000 --- a/meta-openstack/recipes-devtools/python/python-xstatic-roboto-fontface_0.5.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-roboto-fontface.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb b/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb deleted file mode 100644 index 68cb67b2..00000000 --- a/meta-openstack/recipes-devtools/python/python-zake_0.2.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "A python package that works to provide a nice set of testing utilities for the kazoo library." -HOMEPAGE = "https://github.com/yahoo/Zake" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=33573af7505a94ff3d122a7920b2c735" - -SRC_URI[md5sum] = "bd8db293a78c22171ecfdd54f4d65c63" -SRC_URI[sha256sum] = "2e5bcb215e366e682fd05dd1df4f2e6affceefa5d3781c2987a21fd597659a21" - -inherit setuptools3 pypi - -# DEPENDS_default: python-pip - -DEPENDS += " \ - python-pip \ - " - -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-kazoo \ - " diff --git a/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb b/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb deleted file mode 100644 index 47b28f30..00000000 --- a/meta-openstack/recipes-devtools/python/python-zaqarclient_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Python Zaqar Client" -HOMEPAGE = "https://github.com/openstack/python-zaqarclient" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -DEPENDS += " \ - python-pip \ - python-pbr \ - " - -# Satisfy setup.py 'setup_requires' -DEPENDS += " \ - python-pbr-native \ - " - -RDEPENDS_${PN} +=" \ - python-pbr \ - python-requests \ - python-six \ - python-stevedore \ - python-jsonschema \ - python-oslo.i18n \ - python-oslo.log \ - python-oslo.utils \ - python-keystoneauth1 \ - python-osc-lib \ - " - -SRCNAME = "zaqarclient" -SRC_URI = "git://github.com/openstack/${BPN}.git" - -PV = "1.12.0+git${SRCPV}" -SRCREV = "9038bf6ba93c24c9a61447dfcb14e436f1267066" -S = "${WORKDIR}/git" - -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-amqp_2.4.1.bb b/meta-openstack/recipes-devtools/python/python3-amqp_2.4.1.bb deleted file mode 100644 index c2710da2..00000000 --- a/meta-openstack/recipes-devtools/python/python3-amqp_2.4.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-amqp.inc diff --git a/meta-openstack/recipes-devtools/python/python-amqp.inc b/meta-openstack/recipes-devtools/python/python3-amqp_2.6.1.bb index 8863ac21..dd257682 100644 --- a/meta-openstack/recipes-devtools/python/python-amqp.inc +++ b/meta-openstack/recipes-devtools/python/python3-amqp_2.6.1.bb @@ -4,11 +4,11 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=9d6ba772ac59c08a25a12ce15bd5f27b" -SRC_URI[md5sum] = "9e3d5f1f69d2106c2b3f77d275a79924" -SRC_URI[sha256sum] = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb" +SRC_URI[md5sum] = "c8cf9c75d7cd2e747fa49f3e3c47b3b1" +SRC_URI[sha256sum] = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21" -inherit pypi +inherit pypi setuptools3 -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-vine \ " diff --git a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb index 7623d173..5e7c140e 100644 --- a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb @@ -1,2 +1,17 @@ +DESCRIPTION = "Python client for the Advanced Message Queuing Procotol (AMQP)" +HOMEPAGE = "http://code.google.com/p/py-amqplib/" +SECTION = "devel/python" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1702a92c723f09e3fab3583b165a8d90" + +PR = "r1" +SRCNAME = "amqplib" + +SRC_URI = "https://github.com/barryp/py-amqplib/archive/${PV}.tar.gz" + +SRC_URI[md5sum] = "ff405a7b57aa98cdf07d02bd8090fa29" +SRC_URI[sha256sum] = "9461d73f75ca704e6b656738b5dad42a1948e61dfbc8233077d84d00f74c3936" + +S = "${WORKDIR}/py-amqplib-${PV}" + inherit setuptools3 -require python-amqplib.inc diff --git a/meta-openstack/recipes-devtools/python/python3-arrow_0.15.2.bb b/meta-openstack/recipes-devtools/python/python3-arrow_0.15.2.bb deleted file mode 100644 index 99196ea2..00000000 --- a/meta-openstack/recipes-devtools/python/python3-arrow_0.15.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-arrow.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb new file mode 100644 index 00000000..9ef1d8fa --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Better dates and times for Python" +HOMEPAGE = "https://github.com/crsmithdev/arrow" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=62e977be69cd001d6545038b6bb1575c" + +SRC_URI[md5sum] = "76d66d0d03effad1407fb4dcebce9566" +SRC_URI[sha256sum] = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-dateutil \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb new file mode 100644 index 00000000..92a13934 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-automaton_2.2.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Friendly state machines for python" +HOMEPAGE = "https://pypi.python.org/pypi/automaton" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +SRC_URI[md5sum] = "00a1c07d012dfa228ce003d7527e4a7d" +SRC_URI[sha256sum] = "88144e0ec07c40edcb70a547ea74ca5718994e7a0694b6c4cb6679e57eb26095" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pip \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + python3-debtcollector \ + python3-prettytable \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb index 4b85cd5c..614c4eb9 100644 --- a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb +++ b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb @@ -1,5 +1,33 @@ -require python-avahi.inc +RDEPENDS:${PN} += "python3-core python3-dbus" +SUMMARY = "Python bindings for the avahi zeroconf client" +HOMEPAGE = "https://github.com/lathiat/avahi" +SECTION = "devel/python" -inherit python3-dir +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" -RDEPENDS_${PN} += "python3-core python3-dbus" +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz" + +SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" +SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" + +S = "${WORKDIR}/avahi-${PV}" + +inherit python3native python3-dir + +# we only need the python bindings +do_install () { + install -d ${D}${PYTHON_SITEPACKAGES_DIR}/avahi + + sed -i'' -e "s,@PYTHON\@,${bindir}/${PYTHON_PN},g" \ + ${S}/avahi-python/avahi/__init__.py \ + ${S}/avahi-python/avahi-bookmarks.in + + install -m 0775 ${S}/avahi-python/avahi/__init__.py \ + ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/__init__.py + + install -m 0775 ${S}/avahi-python/avahi-bookmarks.in \ + ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/avahi-bookmarks +} + +FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/avahi" diff --git a/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb b/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb new file mode 100644 index 00000000..1ac1d3f4 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-backlash_0.3.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "backlash is a swiss army knife for web applications debugging" +HOMEPAGE = "https://pypi.org/project/backlash/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ca5c23eefc8077a81d9c7b5384f38be8" + +SRC_URI[md5sum] = "c80c065e33b6891c5e5ac70ac3a2551c" +SRC_URI[sha256sum] = "ddf6e1d59ce30deb190478c98ade84557ee9333435fbd377c011588c71f862a0" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-netclient \ + python3-netserver \ + python3-json \ + python3-webob \ + python3-threading \ + python3-logging \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb new file mode 100644 index 00000000..7a0fc81e --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Client library for Barbican API" +HOMEPAGE = "https://github.com/stackforge/python3-barbicanclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e031cff4528978748f9cc064c6e6fa73" + +SRC_URI = "\ + git://github.com/openstack/python-barbicanclient.git;branch=master;protocol=https \ + " + +PV = "5.0.1+git${SRCPV}" +SRCREV = "1f0feb30ccd3b19bc23453d85d3266c85fcf04d6" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-requests \ + python3-six \ + python3-cliff \ + python3-keystoneauth1 \ + python3-oslo.i18n \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-monotonic \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb b/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb new file mode 100644 index 00000000..b0025c49 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-boto_2.49.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Amazon Web Services API" +HOMEPAGE = "https://github.com/boto/boto" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a1067d091272fcce8cc3d88d7e6fdc01" + +SRC_URI[md5sum] = "e9b79f80198da059d9a8055a5352fd6d" +SRC_URI[sha256sum] = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a" + +RDEPENDS:${PN} += "\ + python3-json \ + python3-netclient \ + python3-threading \ + python3-xml \ + python3-logging \ + python3-pickle \ + python3-netserver \ +" + +inherit setuptools3 pypi + diff --git a/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb b/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb new file mode 100644 index 00000000..e9b2db73 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-castellan_3.7.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Generic Key Manager interface for OpenStack" +HOMEPAGE = "https://github.com/openstack/castellan" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[sha256sum] = "528033d00cca4fae078dadfd43db5e52b7af5bba6d97b730aa585eb092356dd7" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-babel \ + python3-cryptography \ + python3-barbicanclient \ + python3-oslo.config \ + python3-oslo.context \ + python3-oslo.i18n \ + python3-oslo.log \ + python3-oslo.utils \ + python3-keystoneauth1 \ + bash \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb b/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb index e05c1d5c..a5769d61 100644 --- a/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb +++ b/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb @@ -1,2 +1,26 @@ -require python-cephclient.inc -inherit setuptools3 +DESCRIPTION = "A client library in python for the Ceph REST API." +HOMEPAGE = "https://github.com/dmsimard/python-cephclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +PYPI_PACKAGE = "python-cephclient" +PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-v${PV}.tar.gz" + +SRC_URI[md5sum] = "e3746607f1af1573a241b4995c10c938" +SRC_URI[sha256sum] = "9776b786da2aebdc0439ea2f809cc8923f52bc0cf610f77a9c1348466961134b" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-lxml \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-cython \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-cliff_2.17.0.bb b/meta-openstack/recipes-devtools/python/python3-cliff_2.17.0.bb deleted file mode 100644 index 07923ca6..00000000 --- a/meta-openstack/recipes-devtools/python/python3-cliff_2.17.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-cliff.inc diff --git a/meta-openstack/recipes-devtools/python/python-cliff.inc b/meta-openstack/recipes-devtools/python/python3-cliff_3.6.0.bb index 8a7ec7d4..a26ae862 100644 --- a/meta-openstack/recipes-devtools/python/python-cliff.inc +++ b/meta-openstack/recipes-devtools/python/python3-cliff_3.6.0.bb @@ -4,10 +4,10 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "d51b9a153c6d9ba597c47bb34cb13366" -SRC_URI[sha256sum] = "f5a1c6b32047aa0d272398d311fd711d41dd5e1cd5195ebe36ebb47f464416fa" +SRC_URI[md5sum] = "8dbf43ad5486186eb80e985ddb38fdec" +SRC_URI[sha256sum] = "a3f4fa67eeafbcfa7cf9fe4b1755d410876528e1d0d115740db00b50a1250272" -inherit pypi +inherit setuptools3 pypi DEPENDS += "\ ${PYTHON_PN}-pbr \ @@ -18,7 +18,7 @@ DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-cmd2 \ ${PYTHON_PN}-pbr \ ${PYTHON_PN}-pyparsing \ diff --git a/meta-openstack/recipes-devtools/python/python3-colorama_0.4.1.bb b/meta-openstack/recipes-devtools/python/python3-colorama_0.4.1.bb deleted file mode 100644 index 89c2fea6..00000000 --- a/meta-openstack/recipes-devtools/python/python3-colorama_0.4.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require python-colorama.inc -inherit setuptools3 - diff --git a/meta-openstack/recipes-devtools/python/python3-coverage_4.0a5.bb b/meta-openstack/recipes-devtools/python/python3-coverage_4.0a5.bb deleted file mode 100644 index 917a06c8..00000000 --- a/meta-openstack/recipes-devtools/python/python3-coverage_4.0a5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-coverage.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-croniter_0.3.30.bb b/meta-openstack/recipes-devtools/python/python3-croniter_0.3.30.bb deleted file mode 100644 index 6ec5a000..00000000 --- a/meta-openstack/recipes-devtools/python/python3-croniter_0.3.30.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 pypi -require python-croniter.inc diff --git a/meta-openstack/recipes-devtools/python/python3-cssselect_0.9.1.bb b/meta-openstack/recipes-devtools/python/python3-cssselect_0.9.1.bb deleted file mode 100644 index de194f87..00000000 --- a/meta-openstack/recipes-devtools/python/python3-cssselect_0.9.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-cssselect.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-cssselect.inc b/meta-openstack/recipes-devtools/python/python3-cssselect_1.1.0.bb index 377560e3..a13a2183 100644 --- a/meta-openstack/recipes-devtools/python/python-cssselect.inc +++ b/meta-openstack/recipes-devtools/python/python3-cssselect_1.1.0.bb @@ -4,10 +4,10 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=952026b3fd2f625f2a3c0aa21da2493d" -SRC_URI[md5sum] = "c74f45966277dc7a0f768b9b0f3522ac" -SRC_URI[sha256sum] = "0535a7e27014874b27ae3a4d33e8749e345bdfa62766195208b7996bf1100682" +SRC_URI[md5sum] = "fa57704c1cb66cc8e537b782bd6b227e" +SRC_URI[sha256sum] = "f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -15,6 +15,6 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb new file mode 100644 index 00000000..2a68108d --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-cursive_0.2.2.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Library for validation of digital signatures." +HOMEPAGE = "https://github.com/openstack/cursive" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +inherit setuptools3 pypi + +SRC_URI[sha256sum] = "fbdc2b088bf0b9a69b1897d726e6027e8fba8f21f0a881344f70e7a407d9abda" + +DEPENDS += " \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-lxml \ + python3-cryptography \ + python3-netifaces \ + python3-six \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-oslo.i18n \ + python3-oslo.log \ + python3-castellan \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-debtcollector_1.22.0.bb b/meta-openstack/recipes-devtools/python/python3-debtcollector_1.22.0.bb deleted file mode 100644 index 7947185b..00000000 --- a/meta-openstack/recipes-devtools/python/python3-debtcollector_1.22.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-debtcollector.inc diff --git a/meta-openstack/recipes-devtools/python/python-debtcollector.inc b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb index d519bfd8..e216c8b0 100644 --- a/meta-openstack/recipes-devtools/python/python-debtcollector.inc +++ b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb @@ -1,13 +1,13 @@ DESCRIPTION = "A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner." HOMEPAGE = "http://docs.openstack.org/developer/debtcollector/" SECTION = "devel/python" -LICENSE = "Apache-2" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI[md5sum] = "0d12694a93a16824b1c67bece341229e" -SRC_URI[sha256sum] = "d1756440d25a50e3eca2fc399c9e5f1ca2f9e6b837570a80b9450999f4290525" +SRC_URI[md5sum] = "6ac3af37693e0f517e51593d9ea33f23" +SRC_URI[sha256sum] = "787981f4d235841bf6eb0467e23057fb1ac7ee24047c32028a8498b9128b6829" -inherit pypi +inherit setuptools3 pypi DEPENDS += " \ ${PYTHON_PN}-pip \ @@ -19,7 +19,9 @@ DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ ${PYTHON_PN}-pbr \ + ${PYTHON_PN}-wrapt \ + ${PYTHON_PN}-six \ " diff --git a/meta-openstack/recipes-devtools/python/python3-deprecation_1.0.1.bb b/meta-openstack/recipes-devtools/python/python3-deprecation_1.0.1.bb deleted file mode 100644 index d2e0f1cf..00000000 --- a/meta-openstack/recipes-devtools/python/python3-deprecation_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-deprecation.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-deprecation.inc b/meta-openstack/recipes-devtools/python/python3-deprecation_2.1.0.bb index eec4dd16..4976b562 100644 --- a/meta-openstack/recipes-devtools/python/python-deprecation.inc +++ b/meta-openstack/recipes-devtools/python/python3-deprecation_2.1.0.bb @@ -4,7 +4,11 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI[md5sum] = "d8a318c66d442dc4b900e070267ed9aa" -SRC_URI[sha256sum] = "b9bff5cc91f601ef2a8a0200bc6cde3f18a48c2ed3d1ecbfc16076b14b3ad935" +SRC_URI[md5sum] = "6b79c6572fb241e3cecbbd7d539bb66b" +SRC_URI[sha256sum] = "72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff" -inherit pypi +RDEPENDS:${PN} += "\ + python3-packaging \ +" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb b/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb new file mode 100644 index 00000000..605c63a6 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-designateclient_4.2.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Python bindings to the Designate API" +HOMEPAGE = "https://github.com/openstack/python-designateclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " +SRC_URI[md5sum] = "51e6aaf70e253c999824c7bc29009f5e" +SRC_URI[sha256sum] = "cf0e76540530491a6100164c514e1c60b55efa25c8db4c18f4902c988d7c1080" + +RDEPENDS:${PN} += " \ + python3-cliff \ + python3-jsonschema \ + python3-osc-lib \ + python3-oslo.utils \ + python3-pbr \ + python3-keystoneauth1 \ + python3-requests \ + python3-six \ + python3-stevedore \ + python3-debtcollector \ + " + +PYPI_PACKAGE = "python-designateclient" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.1.bb b/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.1.bb deleted file mode 100644 index 6cc57ba8..00000000 --- a/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-django-appconf.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-django-appconf.inc b/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.4.bb index 00f2e3e7..cffcb353 100644 --- a/meta-openstack/recipes-devtools/python/python-django-appconf.inc +++ b/meta-openstack/recipes-devtools/python/python3-django-appconf_1.0.4.bb @@ -4,10 +4,11 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=3f34b9b2f6413fd5f91869fa7e992457" -SRC_URI[md5sum] = "29c87a00f0d098b90f3ac6113ae6e52d" -SRC_URI[sha256sum] = "ba1375fb1024e8e91547504d4392321795c989fde500b96ebc7c93884f786e60" +SRC_URI[md5sum] = "da4a355140acaa3eeb236987ab174e9d" +SRC_URI[sha256sum] = "be58deb54a43d77d2e1621fe59f787681376d3cd0b8bd8e4758ef6c3a6453380" -inherit pypi +inherit setuptools3 pypi -#RDEPENDS_${PN} += "${PYTHON_PN}-six \ -# " +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-django \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb b/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb new file mode 100644 index 00000000..0c4dd755 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-django-babel_0.6.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Tools for using Babel with Django" +HOMEPAGE = "https://github.com/python-babel/django-babel" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=5ae97ab65116b8d7890c59de57577b46" + +inherit setuptools3 pypi + +SRC_URI[md5sum] = "a5483952426d1cd749e7204902b34d63" +SRC_URI[sha256sum] = "1e621b198e1f98ae4f93e43463cf78cbedbace475eb6e0853ba1e2567f3b8119" + +DEPENDS += " \ + python3-pip \ + " + +RDEPENDS:${PN} += " \ + python3-django \ + python3-babel \ + " + diff --git a/meta-openstack/recipes-devtools/python/python-django-compressor_2.1.bb b/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb index f6e73dd2..7e50557a 100644 --- a/meta-openstack/recipes-devtools/python/python-django-compressor_2.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-django-compressor_2.1.bb @@ -11,13 +11,13 @@ SRC_URI[sha256sum] = "ae0051bc0c7a0660c93434e68d617553fccdd573293dfd15aa33f78d2b inherit setuptools3 pypi -RDEPENDS_${PN} += " \ - python-django-appconf \ - python-rcssmin \ - python-rjsmin \ +RDEPENDS:${PN} += " \ + python3-django-appconf \ + python3-rcssmin \ + python3-rjsmin \ " -do_install_append() { +do_install:append() { # Ensure permisive perms are granted find -L "${D}${PYTHON_SITEPACKAGES_DIR}/compressor" -type f -exec chmod 644 {} \; find -L "${D}${PYTHON_SITEPACKAGES_DIR}/compressor" -type d -exec chmod 755 {} \; diff --git a/meta-openstack/recipes-devtools/python/python-django-nose_1.4.bb b/meta-openstack/recipes-devtools/python/python3-django-nose_1.4.7.bb index 1e7ccd6a..3fb8b633 100644 --- a/meta-openstack/recipes-devtools/python/python-django-nose_1.4.bb +++ b/meta-openstack/recipes-devtools/python/python3-django-nose_1.4.7.bb @@ -7,17 +7,18 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=7f88f52f66738ec7259424ce46e855c2" -SRC_URI[md5sum] = "2713d95286ea49860458a312d2efe653" -SRC_URI[sha256sum] = "26cef3c6f62df2eee955a25195de6f793881317c0f5fd1a1c6f9e22f351a9313" +SRC_URI[md5sum] = "fe386c6e218b0f7b353494329c380a79" +SRC_URI[sha256sum] = "a4885cd002d65fd2de96e2bb2563ef477c3fbe207009360c015fca5c3b5561b7" inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ - python-django \ - python-nose \ +RDEPENDS:${PN} += " \ + python3-django \ + python3-nose \ + python3-misc \ " diff --git a/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb b/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb new file mode 100644 index 00000000..cee4b85c --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-django-openstack-auth_3.6.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A Django authentication backend for use with the OpenStack Keystone backend." +HOMEPAGE = "http://django_openstack_auth.readthedocs.org/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +PYPI_PACKAGE = "django_openstack_auth" + +SRC_URI[sha256sum] = "9a441fdea3f662fd727f020f479b3e89c96a2cc442c49539634c996a967dd378" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pip \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-django \ + python3-oslo.config \ + python3-oslo.policy \ + python3-keystoneclient \ + python3-keystoneauth1 \ + python3-six \ + " diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb index 7438327b..8cacdd08 100644 --- a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-django-pyscss_2.0.2.bb @@ -12,12 +12,12 @@ inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-django \ - python-pyscss \ - python-pathlib \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-django \ + python3-pyscss \ + python3-pathlib \ " diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_0.9.0.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_0.9.0.bb deleted file mode 100644 index ccfb2925..00000000 --- a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_0.9.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit setuptools3 -require python-dogpile.cache.inc - - diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb new file mode 100644 index 00000000..745de51d --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-dogpile.cache_1.1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Python Dogpile Cache: A caching front-end based on the Dogpile lock" +HOMEPAGE = "https://pypi.python.org/pypi/dogpile.cache" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d830a549d9d8c25362346e0f8fbba53" + +SRC_URI[md5sum] = "fb9bea726156560d03890599c4cd92e0" +SRC_URI[sha256sum] = "2134464672a3deb7ef1366a8691726686d8c62540e4208f1a40c9aaa1a0b6a45" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-decorator \ + python3-logging \ + python3-numbers \ + python3-stevedore \ +" + + diff --git a/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb b/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb index d81698fa..95926603 100644 --- a/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-dogpile.core_0.4.1.bb @@ -1,4 +1,12 @@ -require python-dogpile.core.inc -inherit setuptools3 +DESCRIPTION = "Python Dogpile Core: Dogpile is basically the locking code extracted from the Beaker package, for simple and generic usage." +HOMEPAGE = "https://pypi.python.org/pypi/dogpile.core" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0401fd56584d7b3d4be91690672ec433" + +SRC_URI[md5sum] = "01cb19f52bba3e95c9b560f39341f045" +SRC_URI[sha256sum] = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-ecdsa_0.13.bb b/meta-openstack/recipes-devtools/python/python3-ecdsa_0.13.bb deleted file mode 100644 index 13366f40..00000000 --- a/meta-openstack/recipes-devtools/python/python3-ecdsa_0.13.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-ecdsa.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-enum-compat_0.0.3.bb b/meta-openstack/recipes-devtools/python/python3-enum-compat_0.0.3.bb index a9bff308..a1c0ef6d 100644 --- a/meta-openstack/recipes-devtools/python/python3-enum-compat_0.0.3.bb +++ b/meta-openstack/recipes-devtools/python/python3-enum-compat_0.0.3.bb @@ -1,2 +1,10 @@ -inherit setuptools3 -require python-enum-compat.inc +DESCRIPTION = "Python enum/enum34 compatibility package" +HOMEPAGE = "https://github.com/jstasiak/enum-compat" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI[md5sum] = "74c19a80356825e5351aba8c4c1b00e6" +SRC_URI[sha256sum] = "3677daabed56a6f724451d585662253d8fb4e5569845aafa8bb0da36b1a8751e" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-extras_1.0.0.bb b/meta-openstack/recipes-devtools/python/python3-extras_1.0.0.bb index 76f87f26..a7ed407b 100644 --- a/meta-openstack/recipes-devtools/python/python3-extras_1.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-extras_1.0.0.bb @@ -1,2 +1,10 @@ -inherit setuptools3 -require python-extras.inc +DESCRIPTION = "Useful extra bits for Python - things that should be in the standard library" +HOMEPAGE = "https://pypi.python.org/pypi/extras/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d108f338b2f68fe48ac366c4650bd8b" + +SRC_URI[md5sum] = "3a63ad60cf8f0186c9e3a02f55ec5b14" +SRC_URI[sha256sum] = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb b/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb new file mode 100644 index 00000000..53e99b1d --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-falcon_2.0.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "An unladen web framework for building APIs and app backends." +HOMEPAGE = "http://falconframework.org" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=a0c7260e38287caff6c266d1f287e962" + +SRC_URI[md5sum] = "77c52c144dd284e6259d257c6f008072" +SRC_URI[sha256sum] = "eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6c3d5fc" + +inherit setuptools3 pypi + +# conflicting file prevention +do_install:append() { + rm -f ${D}${libdir}/python*/site-packages/tests/* +} + +DEPENDS += " \ + python3-pip \ + " + +RDEPENDS:${PN} += " \ + python3-six \ + python3-json \ + python3-xml \ + python3-netserver \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-fasteners_git.bb b/meta-openstack/recipes-devtools/python/python3-fasteners_git.bb deleted file mode 100644 index 9b2053c1..00000000 --- a/meta-openstack/recipes-devtools/python/python3-fasteners_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-fasteners.inc diff --git a/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb index c8883be4..a9335317 100644 --- a/meta-openstack/recipes-devtools/python/python-fixtures_3.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=239e2f4698b85aad5ed39bae5d2ef226" SRC_URI[md5sum] = "cd6345b497a62fad739efee66346c2e0" SRC_URI[sha256sum] = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef" -inherit distutils3 pypi +inherit setuptools3 pypi DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ @@ -15,14 +15,14 @@ DISTUTILS_INSTALL_ARGS = "--root=${D} \ --install-data=${datadir}" DEPENDS += " \ - python-pbr \ + python3-pbr \ " # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -RDEPENDS_${PN} += "python-testtools \ - python-pbr \ +RDEPENDS:${PN} += "python3-testtools \ + python3-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb b/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb new file mode 100644 index 00000000..0eaa031e --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-flake8_3.8.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The modular source code checker: pep8, pyflakes and co" +HOMEPAGE = "https://github.com/dreamhost/cliff" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=75b26781f1adf1aa310bda6098937878" + +SRC_URI[md5sum] = "6ab0ad6630b6917fafabded7f80344b4" +SRC_URI[sha256sum] = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += "python3-prettytable \ + python3-cmd2 \ + python3-pyparsing \ + python3-mccabe \ + python3-pep8 \ + python3-logging \ + python3-pyflakes" diff --git a/meta-openstack/recipes-devtools/python/python3-funcsigs_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-funcsigs_1.0.2.bb index 617ebf94..1b4966ba 100644 --- a/meta-openstack/recipes-devtools/python/python3-funcsigs_1.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-funcsigs_1.0.2.bb @@ -1,2 +1,12 @@ -require python-funcsigs.inc -inherit setuptools3 +DESCRIPTION = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+" +HOMEPAGE = "http://funcsigs.readthedocs.org" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d6bc91dc8e5793892189fe7481a2d354" + +SRC_URI[md5sum] = "7e583285b1fb8a76305d6d68f4ccc14e" +SRC_URI[sha256sum] = "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" + +inherit setuptools3 pypi + +CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb b/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb new file mode 100644 index 00000000..08b7e329 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-futurist_2.3.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Useful additions to futures, from the future" +HOMEPAGE = "https://pypi.python.org/pypi/futurist" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[md5sum] = "4d642f5825a516d676356094179c6d27" +SRC_URI[sha256sum] = "174ea146adf303d7e5d7d6d34e3a01f4abf0382b03a6f9309bac2e2d54ffbed6" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pip \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + python3-monotonic \ + python3-contextlib2 \ + python3-prettytable \ + python3-multiprocessing \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb b/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb index 99e4946b..404ab5ae 100644 --- a/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-gevent-websocket_0.10.1.bb @@ -1,2 +1,14 @@ -require python-gevent-websocket.inc -inherit setuptools3 +DESCRIPTION = "Websocket handler for the gevent pywsgi server, a Python network library" +HOMEPAGE = "https://gitlab.com/noppo/gevent-websocket" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5aa2f1d4ea55d60497aa8c3debf29ab2" + +SRC_URI[md5sum] = "e095bf3358175489a956949c1b4de9ff" +SRC_URI[sha256sum] = "7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2d85fb0" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-gevent \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb new file mode 100644 index 00000000..7dc729cf --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "Glance stores library" +HOMEPAGE = "https://github.com/openstack/glance_store" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI = "\ + git://git.openstack.org/openstack/glance_store.git;branch=stable/pike \ + " + +PV="0.22.0+git${SRCPV}" +SRCREV="49c915f498fc8d91c98fcf4e07ceecdcf167fc5a" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + bash \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-oslo.concurrency \ + python3-stevedore \ + python3-eventlet \ + python3-six \ + python3-jsonschema \ + python3-keystoneauth1 \ + python3-keystoneclient \ + python3-requests \ + python3-monotonic \ + python3-dnspython \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb b/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb index 8b5571bf..c8f9135b 100644 --- a/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb @@ -1,2 +1,18 @@ -inherit setuptools3 -require python-happybase.inc +DESCRIPTION = "Python library to interact with Apache HBase" +HOMEPAGE = "https://pypi.python.org/pypi/happybase/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=41f55ae3d7000e4323e84c468d8b42ee" + +SRC_URI[md5sum] = "96cb7ea8163f531907fabd0dddc8b87e" +SRC_URI[sha256sum] = "850b4ee651128588a57e1e152dd1252e5ec39776a5d3d14ee892b8bac0fa9e1a" + +inherit setuptools3 pypi + +do_install:append() { + perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt") + perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO") + for f in $perm_files; do + chmod 644 "${f}" + done +} diff --git a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb index bb8f5476..a6dee5ca 100644 --- a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb +++ b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb @@ -4,15 +4,20 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRC_URI[md5sum] = "0d5f8e7685e7f9a34dbd2552ffa40984" -SRC_URI[sha256sum] = "de7d93338d3afb71cc4c53d713740316ead0af3a9c869b1231617347e94a8326" +SRC_URI[md5sum] = "395e95fecdfa47a89e260998fd5e50b4" +SRC_URI[sha256sum] = "8608e11c2cfdd198bbead763a1a73008a17111c67e44a7e299922f4d5da8ca33" inherit setuptools3 pypi DEPENDS += "\ - python-pbr \ + python3-pbr \ " -RDPENDS_${PN} += "\ - python-pbr \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += "\ + python3-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python3-hgtools_6.3.bb b/meta-openstack/recipes-devtools/python/python3-hgtools_6.3.bb deleted file mode 100644 index 51a488ff..00000000 --- a/meta-openstack/recipes-devtools/python/python3-hgtools_6.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-hgtools.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-hgtools_8.2.1.bb b/meta-openstack/recipes-devtools/python/python3-hgtools_8.2.1.bb new file mode 100644 index 00000000..b37ffbf0 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-hgtools_8.2.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Classes and setuptools plugin for Mercurial repositories" +HOMEPAGE = "https://pypi.python.org/pypi/hgtools" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" + +SRC_URI[md5sum] = "5234d6ea4987f1ccdd1aa87235550c81" +SRC_URI[sha256sum] = "6d0aa3eb4b73e937d6e1f928a011911621b54a95cee8d999839362039dfe8d4b" + +DEPENDS += " \ + python3-setuptools-scm-native \ + python3-toml-native \ +" + +inherit setuptools3 pypi + diff --git a/meta-openstack/recipes-devtools/python/python-hp3parclient/fix_hp3parclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python3-hp3parclient/fix_hp3parclient_memory_leak.patch index ac196fd0..25aebc0e 100644 --- a/meta-openstack/recipes-devtools/python/python-hp3parclient/fix_hp3parclient_memory_leak.patch +++ b/meta-openstack/recipes-devtools/python/python3-hp3parclient/fix_hp3parclient_memory_leak.patch @@ -4,7 +4,7 @@ --- a/hp3parclient/http.py +++ b/hp3parclient/http.py -@@ -61,6 +61,7 @@ +@@ -66,6 +66,7 @@ self.set_debug_flag(http_log_debug) self.times = [] # [("item", starttime, endtime), ...] @@ -25,7 +25,7 @@ def _http_log_req(self, args, kwargs): if not self.http_log_debug: return -@@ -205,6 +212,9 @@ +@@ -208,6 +215,9 @@ resp, body = self.request(url, method, **kwargs) self.times.append(("%s %s" % (method, url), start_time, time.time())) @@ -33,5 +33,5 @@ + while len(self.times) > self.times_max_len: + del self.times[0] return resp, body - - + + def _do_reauth(self, url, method, ex, **kwargs): diff --git a/meta-openstack/recipes-devtools/python/python-hp3parclient_3.2.0.bb b/meta-openstack/recipes-devtools/python/python3-hp3parclient_3.2.0.bb index 269c73e1..269c73e1 100644 --- a/meta-openstack/recipes-devtools/python/python-hp3parclient_3.2.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-hp3parclient_3.2.0.bb diff --git a/meta-openstack/recipes-devtools/python/python3-httplib2_0.14.0.bb b/meta-openstack/recipes-devtools/python/python3-httplib2_0.14.0.bb deleted file mode 100644 index 03be0bde..00000000 --- a/meta-openstack/recipes-devtools/python/python3-httplib2_0.14.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-httplib2.inc diff --git a/meta-openstack/recipes-devtools/python/python3-httpretty_0.9.7.bb b/meta-openstack/recipes-devtools/python/python3-httpretty_0.9.7.bb deleted file mode 100644 index b9f7699a..00000000 --- a/meta-openstack/recipes-devtools/python/python3-httpretty_0.9.7.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools3 -require python-httpretty.inc - diff --git a/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb b/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb new file mode 100644 index 00000000..99c87b3d --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-httpretty_1.0.5.bb @@ -0,0 +1,24 @@ +# +# Copyright (C) 2014 Wind River Systems, Inc. +# +DESCRIPTION = "HTTP client mock for Python" +HOMEPAGE = "https://pypi.python.org/pypi/httpretty" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d87f7868a62b8d598eab40164594d21b" + +SRC_URI[md5sum] = "6d71a2387997ae8523dcc7ada51cb46a" +SRC_URI[sha256sum] = "e53c927c4d3d781a0761727f1edfad64abef94e828718e12b672a678a8b3e0b5" + +inherit setuptools3 pypi + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-core \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-i18n_0.3.1.bb b/meta-openstack/recipes-devtools/python/python3-i18n_0.3.1.bb deleted file mode 100644 index 8e98d137..00000000 --- a/meta-openstack/recipes-devtools/python/python3-i18n_0.3.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-i18n.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-i18n.inc b/meta-openstack/recipes-devtools/python/python3-i18n_0.3.9.bb index 74200e7c..e9e1d693 100644 --- a/meta-openstack/recipes-devtools/python/python-i18n.inc +++ b/meta-openstack/recipes-devtools/python/python3-i18n_0.3.9.bb @@ -2,14 +2,14 @@ DESCRIPTION = "Translation library for Python" HOMEPAGE = "https://github.com/tuvistavie/python-i18n" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;md5=7624ac071dec291ca8ef74e62e536a7a" +LIC_FILES_CHKSUM = "file://README.md;md5=57cb947993e30ec5ab6df3f12d04ebad" PYPI_PACKAGE = "python-i18n" -SRC_URI[md5sum] = "08b8c247add9f90806c4742a685fdb88" -SRC_URI[sha256sum] = "e1d832ff7d1d39ce593793cc709b2344aa8fdf321cf707081335f146160d9f20" +SRC_URI[md5sum] = "581de49007179e536c4c47982a651cea" +SRC_URI[sha256sum] = "df97f3d2364bf3a7ebfbd6cbefe8e45483468e52a9e30b909c6078f5f471e4e8" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -17,7 +17,7 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ ${PYTHON_PN}-pyyaml \ " diff --git a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb new file mode 100644 index 00000000..bb236eb8 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Google's IP address manipulation library" +HOMEPAGE = "http://code.google.com/p/ipaddr-py/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e7e54827196088e6e96b33e9aec35c4a" + +SRC_URI[md5sum] = "f88353e40dec06410acfa075b8209b27" +SRC_URI[sha256sum] = "4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb b/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb new file mode 100644 index 00000000..24546cf3 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-jmespath_0.10.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "JSON Matching Expressions" +HOMEPAGE = "https://pypi.org/project/jmespath/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4" + +SRC_URI[md5sum] = "65bdcb5fa5bcf1cc710ffa508e78e408" +SRC_URI[sha256sum] = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-math \ + python3-json \ + python3-numbers \ +" diff --git a/meta-openstack/recipes-devtools/python/python-jsonext_0.4.2.bb b/meta-openstack/recipes-devtools/python/python3-jsonext_0.4.2.bb index fad44f5e..5a994d00 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonext_0.4.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-jsonext_0.4.2.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "e7634e0b8d1a668bd2c92db5498f6162573feb72ac050c4415384e773b inherit setuptools3 pypi -RDEPENDS_${PN} += " \ - python-six \ - python-arrow \ +RDEPENDS:${PN} += " \ + python3-six \ + python3-arrow \ " diff --git a/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb b/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb new file mode 100644 index 00000000..7a08f95c --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-jsonpath-rw-ext_1.2.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "Extensions for JSONPath RW" +HOMEPAGE = "https://github.com/sileht/python-jsonpath-rw-ext" +SECTION = "devel/python" +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[sha256sum] = "a9e44e803b6d87d135b09d1e5af0db4d4cf97ba62711a80aa51c8c721980a994" + +inherit pypi setuptools3 + +DEPENDS += " \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-babel \ + python3-jsonpath-rw \ + python3-six \ + python3-ply \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb index c320f012..77366f36 100644 --- a/meta-openstack/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb @@ -1,2 +1,10 @@ -require python-jsonpath-rw.inc -inherit setuptools3 +DESCRIPTION = "A robust and significantly extended implementation of JSONPath for Python" +HOMEPAGE = "https://github.com/kennknowles/python-jsonpath-rw" +SECTION = "devel/python" +LICENSE = "BSD+" +LIC_FILES_CHKSUM = "file://README.rst;md5=02384665f821c394981e0dd1faec9a7d" + +SRC_URI[md5sum] = "3a807e05c2c12158fc6bb0a402fd5778" +SRC_URI[sha256sum] = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb index 55c9fcbb..24b3220a 100644 --- a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb @@ -1,3 +1,27 @@ -require python-kafka.inc +SUMMARY = "Python client for Apache Kafka" +HOMEPAGE = "https://github.com/mumrah/kafka-python" +SECTION = "devel/python" +LICENSE = "Apache-2.0" + +PV = "2.0.2+git${SRCPV}" +SRCREV = "5bb126bf20bbb5baeb4e9afc48008dbe411631bc" + +SRCNAME = "kafka-python" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=22efebb1e053dcc946f4b9d17f3cbbea" +SRC_URI = "git://github.com/mumrah/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + inherit setuptools3 +DEPENDS += " \ + ${PYTHON_PN}-pbr \ + " + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-compression \ + " + diff --git a/meta-openstack/recipes-devtools/python/python-kazoo_2.0.bb b/meta-openstack/recipes-devtools/python/python3-kazoo_2.8.0.bb index db7c0238..e88f21a8 100644 --- a/meta-openstack/recipes-devtools/python/python-kazoo_2.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-kazoo_2.8.0.bb @@ -5,19 +5,21 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" # Archived version so we have to overwrite what the pypi class will derive -PYPI_SRC_URI = "https://pypi.python.org/packages/source/k/${SRCNAME}/kazoo-${PV}.zip" +SRCNAME = "kazoo" -SRC_URI[md5sum] = "4b172de456c102b0e33f661e7e2b3583" -SRC_URI[sha256sum] = "f0c42cc7752a331ba59269827bd19cb271210399a9dcab32b6a91465b4431a18" +PYPI_SRC_URI = "https://pypi.python.org/packages/source/k/${SRCNAME}/kazoo-${PV}.tar.gz" + +SRC_URI[md5sum] = "5b2667e9c3f7b92675aef16c14cef97c" +SRC_URI[sha256sum] = "588e27868e4a0ed70ae4a7a5b0f3bca4cec5e5c49dbd7e41349c0883182bf2fe" inherit setuptools3 pypi -# DEPENDS_default: python-pip +# DEPENDS_default: python3-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb b/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb new file mode 100644 index 00000000..2d8f51da --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-keyring_22.0.1.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Store and access your passwords safely" +HOMEPAGE = "https://pypi.python.org/pypi/keyring/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" + +SRC_URI[md5sum] = "88e1607f9f40b82ab9e28529eec3edbc" +SRC_URI[sha256sum] = "9acb3e1452edbb7544822b12fd25459078769e560fa51f418b6d00afaa6178df" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-hgtools \ + python3-setuptools-scm-native \ + python3-toml-native \ +" + +RDEPENDS:${PN} = " \ + python3-logging \ + python3-importlib-metadata \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb deleted file mode 100644 index 75adf3dc..00000000 --- a/meta-openstack/recipes-devtools/python/python3-keystoneauth1_3.18.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-keystoneauth1.inc diff --git a/meta-openstack/recipes-devtools/python/python-keystoneauth1.inc b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.3.0.bb index bca6ce90..6557f6cb 100644 --- a/meta-openstack/recipes-devtools/python/python-keystoneauth1.inc +++ b/meta-openstack/recipes-devtools/python/python3-keystoneauth1_4.3.0.bb @@ -4,10 +4,10 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=96f840d59b245a1c817fbcb901afc574" -SRC_URI[md5sum] = "6104205044175fa8aac659582fdd0260" -SRC_URI[sha256sum] = "3ae67c6542ed66a37cddcd26a35457c1ff5cd14b20f5490973273cf9eb555a52" +SRC_URI[md5sum] = "455ff39860b21e924305f4db3d74e293" +SRC_URI[sha256sum] = "e3fa55b58f082e4d753ae3fe599f3d74c591fd9cb8286879ff532a78955163f1" -inherit pypi +inherit setuptools3 pypi DEPENDS += " \ ${PYTHON_PN}-pbr \ @@ -18,7 +18,7 @@ DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-pbr \ ${PYTHON_PN}-iso8601 \ ${PYTHON_PN}-requests \ diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystone-api-check.sh b/meta-openstack/recipes-devtools/python/python3-keystoneclient/keystone-api-check.sh index aba6d5f4..aba6d5f4 100644 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystone-api-check.sh +++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient/keystone-api-check.sh diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb new file mode 100644 index 00000000..689cb0da --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "Client library for OpenStack Identity API" +HOMEPAGE = "https://github.com/openstack/python-keystoneclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55" + +SRCNAME = "keystoneclient" + +SRC_URI = "file://keystone-api-check.sh" + +SRC_URI = "\ + git://github.com/openstack/python-keystoneclient.git;branch=stable/pike;protocol=https \ + file://keystone-api-check.sh \ + " + +PV = "4.1.0+git${SRCPV}" +SRCREV = "7ff05baa1fa56f152173651f16fc6fd181291292" +S = "${WORKDIR}/git" + +inherit setuptools3 monitor + +FILES:${PN}-doc += "${datadir}/keystoneclient" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + bash \ + python3-pbr \ + python3-debtcollector \ + python3-keystoneauth1 \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-positional \ + python3-requests \ + python3-six \ + python3-stevedore \ + " + +do_install:append() { + cp -r ${S}/examples ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME} +} + +PACKAGES =+ " ${SRCNAME}-tests" + +FILES:${SRCNAME}-tests = "${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \ + " +RDEPENDS:${SRCNAME}-tests += " \ + python3-httpretty \ + bash \ + " + +MONITOR_CHECKS_${PN} += "\ + keystone-api-check.sh \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb new file mode 100644 index 00000000..66ed6420 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-keystonemiddleware_git.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Middleware for OpenStack Identity API" +HOMEPAGE = "https://launchpad.net/keystonemiddleware" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55" + +SRCNAME = "keystonemiddleware" + +SRC_URI = "\ + git://git.openstack.org/openstack/keystonemiddleware;branch=stable/pike \ + " + +PV = "4.17.1+git${SRCPV}" +SRCREV = "6712e8b7125fcbcf891b7e89ecb240798dad28ac" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-keystoneauth1 \ + python3-oslo.config \ + python3-oslo.context \ + python3-oslo.i18n \ + python3-oslo.log \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-pbr \ + python3-positional \ + python3-pycadf \ + python3-keystoneclient \ + python3-requests \ + python3-six \ + python3-webob \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-kombu_4.6.6.bb b/meta-openstack/recipes-devtools/python/python3-kombu_4.6.6.bb deleted file mode 100644 index 11b0826f..00000000 --- a/meta-openstack/recipes-devtools/python/python3-kombu_4.6.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-kombu.inc diff --git a/meta-openstack/recipes-devtools/python/python-kombu.inc b/meta-openstack/recipes-devtools/python/python3-kombu_5.0.2.bb index 80297079..bd06f3ee 100644 --- a/meta-openstack/recipes-devtools/python/python-kombu.inc +++ b/meta-openstack/recipes-devtools/python/python3-kombu_5.0.2.bb @@ -4,13 +4,13 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=daea7c168428449fbee05e644df929f4" -SRC_URI[md5sum] = "5f751ea817b1f6a4293d4e3a01040d4f" -SRC_URI[sha256sum] = "1760b54b1d15a547c9a26d3598a1c8cdaf2436386ac1f5561934bc8a3cbbbd86" +SRC_URI[md5sum] = "52192e631ac39a443fb1abeb52299f22" +SRC_URI[sha256sum] = "f4965fba0a4718d47d470beeb5d6446e3357a62402b16c510b6a2f251e05ac3c" -inherit pypi +inherit setuptools3 pypi -FILES_${PN}-doc += "${datadir}/${SRCNAME}" +FILES:${PN}-doc += "${datadir}/${SRCNAME}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${PYTHON_PN}-amqp \ " diff --git a/meta-openstack/recipes-devtools/python/python3-lesscpy_0.10.2.bb b/meta-openstack/recipes-devtools/python/python3-lesscpy_0.10.2.bb deleted file mode 100644 index 167b9704..00000000 --- a/meta-openstack/recipes-devtools/python/python3-lesscpy_0.10.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-lesscpy.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy.inc b/meta-openstack/recipes-devtools/python/python3-lesscpy_0.14.0.bb index c10b0b8d..74da06d5 100644 --- a/meta-openstack/recipes-devtools/python/python-lesscpy.inc +++ b/meta-openstack/recipes-devtools/python/python3-lesscpy_0.14.0.bb @@ -5,12 +5,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a01aae31681ac25b4c46f98d627b9b5d" DEPENDS += "${PYTHON_PN}-ply" -RDEPENDS_${PN} += "${PYTHON_PN}-ply" +RDEPENDS:${PN} += "${PYTHON_PN}-ply" -SRC_URI[md5sum] = "fedbad1f4eb19c3af37f09560156246d" -SRC_URI[sha256sum] = "ccad1ad2a89ced1875c5ca4e16e5478b791d31fb187fe29f1541859318ed9055" +SRC_URI[md5sum] = "efe82be479ddb7bdc48b2114dab94b20" +SRC_URI[sha256sum] = "7b664f60818a16afa8cc9f1dd6d9b17f944e0ce94e50787d76f81bc7a8648cce" -inherit pypi +inherit setuptools3 pypi DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ diff --git a/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb index e5730901..ba446380 100644 --- a/meta-openstack/recipes-devtools/python/python-lockfile_0.12.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb @@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72" SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9" SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799" -inherit distutils3 pypi +inherit setuptools3 pypi DEPENDS += "\ - python-pbr \ + python3-pbr \ " # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -RDEPENDS_${PN} += "\ - python-pbr \ +RDEPENDS:${PN} += "\ + python3-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python3-logutils_0.3.5.bb b/meta-openstack/recipes-devtools/python/python3-logutils_0.3.5.bb index 4d760e09..c0068559 100644 --- a/meta-openstack/recipes-devtools/python/python3-logutils_0.3.5.bb +++ b/meta-openstack/recipes-devtools/python/python3-logutils_0.3.5.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-logutils.inc +DESCRIPTION = "Set of handlers for the Python standard library's logging package" +HOMEPAGE = "https://pypi.python.org/pypi/logutils" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44c35f0b8e2a27a2f33a4e4a5c65d014" + +SRC_URI[md5sum] = "fcd2f8e9217bfa0b580f253b35a9d954" +SRC_URI[sha256sum] = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82" + +inherit setuptools3 pypi + +# avoid "error: option --single-version-externally-managed not recognized" +DISTUTILS_INSTALL_ARGS = "--root=${D} \ + --prefix=${prefix} \ + --install-lib=${PYTHON_SITEPACKAGES_DIR} \ + --install-data=${datadir}" diff --git a/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb b/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb new file mode 100644 index 00000000..68676000 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Python client for containers service" +HOMEPAGE = "https://github.com/openstack/python-magnumclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +SRC_URI[sha256sum] = "9734fbaa571fe11f252835878999efe02d4200ca9a5b1d9fe691fd5f4ec81f3b" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} +=" \ + python3-pbr \ + python3-babel \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-iso8601 \ + python3-requests \ + python3-keystoneclient \ + python3-pyyaml \ + python3-stevedore \ + python3-six \ + " + +PYPI_PACKAGE = "python-magnumclient" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb b/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb new file mode 100644 index 00000000..7e51ec66 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Python bindings to the OpenStack Manila API" +HOMEPAGE = "https://github.com/openstack/python-manilaclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9edbbf5857ab51214ef0e8b79069bb07" + +SRC_URI[sha256sum] = "e314cce0e1d2b92ff194dfa8e29bc67dd5703799a43abf7c323616ddb50d83c0" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} +=" \ + python3-pbr \ + python3-iso8601 \ + python3-oslo.config \ + python3-oslo.log \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-prettytable \ + python3-pycrypto \ + python3-requests \ + python3-simplejson \ + python3-babel \ + python3-six \ + python3-keystoneclient \ + " + +PYPI_PACKAGE = "python-manilaclient" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-mccabe_0.2.1.bb b/meta-openstack/recipes-devtools/python/python3-mccabe_0.2.1.bb deleted file mode 100644 index 8af8ec57..00000000 --- a/meta-openstack/recipes-devtools/python/python3-mccabe_0.2.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-mccabe.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-memcache_1.2.9.bb b/meta-openstack/recipes-devtools/python/python3-memcache_1.2.9.bb deleted file mode 100644 index 08ecb7b6..00000000 --- a/meta-openstack/recipes-devtools/python/python3-memcache_1.2.9.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-memcache.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb b/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb new file mode 100644 index 00000000..cb7dadc4 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-memcache_3.4.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A comprehensive, fast, pure Python memcached client" +HOMEPAGE = "https://github.com/Pinterest/pymemcache" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=efde6ee9f51b69abbdca7d447b0d1488" + +PYPI_PACKAGE = "pymemcache" + +SRC_URI[md5sum] = "f0da0618d828f67ff3e0742c9ace3cd7" +SRC_URI[sha256sum] = "47882ab1c7e5e1dea67df8aa9faf410ce82e606fd5f29501273a60ff61d7cc99" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + ${PYTHON_PN}-six-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-logging \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb index de967343..aaa5d686 100644 --- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb @@ -1,2 +1,24 @@ -require python-memcached.inc +SUMMARY = "Pure python memcached client" +DESCRIPTION = "\ + This software is a 100% Python interface to the memcached memory cache daemon. \ + It is the client side software which allows storing values in one or more, possibly remote, \ + memcached servers. Search google for memcached for more information." +HOMEPAGE = "https://pypi.python.org/pypi/python-memcached/" +SECTION = "devel/python" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://PSF.LICENSE;md5=7dd786e8594f1e787da94a946557b40e" + +PV = "1.59+git${SRCPV}" +SRCREV = "959e068fec8b4c956b0d82269336818e667726e7" + +SRC_URI = "git://github.com/linsomniac/python-memcached.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + inherit setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-pickle \ + " + diff --git a/meta-openstack/recipes-devtools/python/python-microversion-parse_git.bb b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb index 464649e9..0860aae6 100644 --- a/meta-openstack/recipes-devtools/python/python-microversion-parse_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb @@ -5,11 +5,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "\ - git://github.com/openstack/microversion-parse.git;branch=master \ + git://github.com/openstack/microversion-parse.git;branch=master;protocol=https \ " -PV = "0.1.4+git${SRCPV}" -SRCREV = "1f6eac7c3df048679663919f75c2bcecd3e183a2" +PV = "1.0.1+git${SRCPV}" +SRCREV = "2c36df6bf33e42c379fbd8228fbe63c77b3714b1" S = "${WORKDIR}/git" inherit setuptools3 @@ -17,6 +17,11 @@ inherit setuptools3 DEPENDS += " \ " -RDEPENDS_${PN} += " \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ " -
\ No newline at end of file + diff --git a/meta-openstack/recipes-devtools/python/python-mimeparse_0.1.4.bb b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb index c9b17ff4..ae7bd430 100644 --- a/meta-openstack/recipes-devtools/python/python-mimeparse_0.1.4.bb +++ b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb @@ -2,16 +2,20 @@ DESCRIPTION = "basic functions for parsing mime-type names and matching " HOMEPAGE = "https://pypi.python.org/pypi/python-mimeparse/" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README;md5=07e6feb820fbca7eb99538badb3cd8e2" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=1f333cc431fd2aaf1a80b1b7212a6086" PYPI_PACKAGE = "python-mimeparse" -SRC_URI[md5sum] = "1d2816a16f17dcfe0c613da611fe7e13" -SRC_URI[sha256sum] = "3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3" +SRC_URI[md5sum] = "a32ae1df93be1ddb581d1c0fa124bab4" +SRC_URI[sha256sum] = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78" -inherit distutils3 pypi +inherit pypi setuptools3 DISTUTILS_INSTALL_ARGS = "--root=${D} \ --prefix=${prefix} \ --install-lib=${PYTHON_SITEPACKAGES_DIR} \ --install-data=${datadir}" + +RDEPENDS:${PN} += " \ + python3-netserver \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb b/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb new file mode 100644 index 00000000..7f797548 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Python client for Mistral REST API" +HOMEPAGE = "https://github.com/openstack/python-mistralclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI[sha256sum] = "b03d52ec860df292192a0face767585633e209ba9297fc71da70d42d6a76aebe" + +PYPI_PACKAGE = "python-mistralclient" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} +=" \ + python3-cliff \ + python3-pbr \ + python3-keystoneclient \ + python3-pyyaml \ + python3-requests \ + " + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-mock_4.0.1.bb b/meta-openstack/recipes-devtools/python/python3-mock_4.0.1.bb deleted file mode 100644 index 3dcb0284..00000000 --- a/meta-openstack/recipes-devtools/python/python3-mock_4.0.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-mock.inc -inherit setuptools3 - -SRC_URI[md5sum] = "8f48ba3fd059e7cfad92f8354064adfd" -SRC_URI[sha256sum] = "2a572b715f09dd2f0a583d8aeb5bb67d7ed7a8fd31d193cf1227a99c16a67bc3"
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-mox3_0.28.0.bb b/meta-openstack/recipes-devtools/python/python3-mox3_1.1.0.bb index 770569b8..c7e28fe4 100644 --- a/meta-openstack/recipes-devtools/python/python-mox3_0.28.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-mox3_1.1.0.bb @@ -4,21 +4,21 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "c930d8479996541b04447a67e96e4a62" -SRC_URI[sha256sum] = "8094868e70f814b4a526ecc592365437bc93a7dd60341321344987b3e8dba49d" +SRC_URI[md5sum] = "0eff74d3a85ec4d4dc6acf7f524ca816" +SRC_URI[sha256sum] = "8a526b7b9b6341f541a9aef3e08c93fd84a5373fe89d4cc51dd571f085b2363c" inherit setuptools3 pypi DEPENDS += "\ - python-pbr \ + python3-pbr \ " # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -RDEPENDS_${PN} += " \ - python-pbr \ - python-fixtures \ +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-fixtures \ " diff --git a/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb b/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb new file mode 100644 index 00000000..8cd800c5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-munch_2.5.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "munch is a fork of David Schoonover's Bunch package, providing similar functionality" +HOMEPAGE = "https://pypi.org/project/munch/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0291cd32b2d6a91d9b19970c94d0a46" + +SRC_URI[md5sum] = "ed84c3718416c8d4d03d0a6ef46e8e0c" +SRC_URI[sha256sum] = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pbr-native \ +" + +RDEPENDS:${PN} += " \ + python3-pkg-resources \ + python3-six \ +" diff --git a/meta-openstack/recipes-devtools/python/python-nose-exclude_0.2.0.bb b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb index 0a674c6b..765c9b08 100644 --- a/meta-openstack/recipes-devtools/python/python-nose-exclude_0.2.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb @@ -4,19 +4,19 @@ DESCRIPTION = "Nose plugin that allows you to easily specify directories to be excluded from testing." HOMEPAGE = "http://bitbucket.org/kgrandis/nose-exclude" SECTION = "devel/python" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" -SRC_URI[md5sum] = "c8d798c3e29ac82dd5c7bf98a99404af" -SRC_URI[sha256sum] = "27babdc53e0741ed09d21b7fdb5d244aabb1679f67ef81289f0f34e50aca51c9" +SRC_URI[md5sum] = "072f72e782f28a9c42356976f8ec22d9" +SRC_URI[sha256sum] = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304" inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ - python-nose \ +RDEPENDS:${PN} += " \ + python3-nose \ " diff --git a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch index ef3393f3..85befc9f 100644 --- a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch +++ b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch @@ -1,13 +1,13 @@ Index: git/setup.py =================================================================== --- /dev/null -+++ git/setup.py ++++ b/setup.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python + +from distutils.core import setup + -+setup(name='python-novnc', ++setup(name='python3-novnc', + version='2012.1~e3', + description='NoVNC python libraries', + author='Ghe Rivero', diff --git a/meta-openstack/recipes-devtools/python/python3-novnc_git.bb b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb new file mode 100644 index 00000000..b41b5876 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "This package contains the core python parts of NoVNC" +HOMEPAGE = "https://github.com/kanaka/noVNC" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99aebbcc36b17df855fad64d4b792bff" + +SRCREV = "463c39e4af98ec4106b87bbea17e1605aa4c6180" +PV = "1.3.0" + +SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \ + file://python-distutils.patch" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " python3-websockify" diff --git a/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.2.bb b/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.2.bb deleted file mode 100644 index 96508007..00000000 --- a/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-oauth2client.inc diff --git a/meta-openstack/recipes-devtools/python/python-oauth2client.inc b/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.3.bb index d91fc463..7943e393 100644 --- a/meta-openstack/recipes-devtools/python/python-oauth2client.inc +++ b/meta-openstack/recipes-devtools/python/python3-oauth2client_4.1.3.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://github.com/google/oauth2client/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=038e1390e94fe637991fa5569daa62bc" -inherit pypi +inherit setuptools3 pypi -SRC_URI[md5sum] = "bc30976cd1e859cd6199264a50c5ba72" -SRC_URI[sha256sum] = "bd3062c06f8b10c6ef7a890b22c2740e5f87d61b6e1f4b1c90d069cdfc9dadb5" +SRC_URI[md5sum] = "3a9eb781f685949c04946f6c09e4c11d" +SRC_URI[sha256sum] = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-httplib2 \ ${PYTHON_PN}-pyasn1 \ ${PYTHON_PN}-pyasn1-modules \ diff --git a/meta-openstack/recipes-devtools/python/python-openstack-nose_0.11.bb b/meta-openstack/recipes-devtools/python/python3-openstack-nose_0.11.bb index 42d836f4..9dcbb7ff 100644 --- a/meta-openstack/recipes-devtools/python/python-openstack-nose_0.11.bb +++ b/meta-openstack/recipes-devtools/python/python3-openstack-nose_0.11.bb @@ -15,12 +15,12 @@ SRC_URI[sha256sum] = "a28d44dc23de8164d7893da7020404c73c4325b46d5507911f0257c15f inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ - python-nose \ - python-colorama \ - python-termcolor \ +RDEPENDS:${PN} += " \ + python3-nose \ + python3-colorama \ + python3-termcolor \ " diff --git a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb new file mode 100644 index 00000000..5e5035d4 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Unified SDK for OpenStack" +HOMEPAGE = "https://github.com/openstack/python-openstacksdk" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI = " \ + git://github.com/openstack/python-openstacksdk.git;branch=master;protocol=https \ + " + +PV = "0.52.0+git${SRCPV}" +SRCREV = "e169c495de39a2d97ef1d8bb7894b18e4ef268dd" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += "\ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + bash \ + python3-jsonpatch \ + python3-six \ + python3-stevedore \ + python3-os-client-config \ + python3-keystoneauth1 \ + python3-deprecation \ + python3-os-service-types \ + python3-munch \ + python3-jmespath \ + python3-netifaces \ + python3-decorator \ + python3-dogpile.cache \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb b/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb index 46c08d0d..7fa27101 100644 --- a/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb @@ -1,2 +1,21 @@ -require python-ordereddict.inc -inherit setuptools3 +DESCRIPTION = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6." +HOMEPAGE = "https://pypi.python.org/pypi/ordereddict" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7f0267460024072a9bbf135ee87a41b8" + +SRC_URI[md5sum] = "a0ed854ee442051b249bfad0f638bbec" +SRC_URI[sha256sum] = "1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pip \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb new file mode 100644 index 00000000..093b673e --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "OpenStack Cinder brick library for managing local volume attaches" +HOMEPAGE = "https://github.com/openstack/os-brick" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI = "\ + git://github.com/openstack/os-brick.git;branch=stable/victoria;protocol=https \ + " +SRCREV = "f0cf77672fed70f20896c23015cb50341f311f38" + +PV = "4.0.1+git${SRCPV}" +S = "${WORKDIR}/git" + +inherit setuptools3 + +FILES:${PN} += "${datadir}/etc/*" + +DEPENDS += " \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-babel \ + python3-eventlet \ + python3-oslo.concurrency \ + python3-oslo.log \ + python3-oslo.serialization \ + python3-oslo.i18n \ + python3-oslo.privsep \ + python3-oslo.service \ + python3-oslo.utils \ + python3-requests \ + python3-retrying \ + python3-six \ + python3-os-win \ diff --git a/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb b/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb new file mode 100644 index 00000000..71f756a6 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-os-service-types_1.7.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Python library for consuming OpenStack sevice-types-authority data" +HOMEPAGE = "https://pypi.org/project/os-service-types/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[sha256sum] = "31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb index 570fec41..69ab2233 100644 --- a/meta-openstack/recipes-devtools/python/python-os-traits_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-os-traits_2.4.0.bb @@ -4,21 +4,19 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRC_URI = "\ - git://github.com/openstack/os-traits.git;branch=stable/pike \ - " - -PV = "0.3.3+git${SRCPV}" -SRCREV = "3e8b4a77aaf2d8b64f89ba3b479113d0b44bbe2f" -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "af1df9485a3119c2a6647639c8bb8bb852cb839ad9c12fa1d9e72f402c66af49" -inherit setuptools3 +inherit setuptools3 pypi DEPENDS += " \ - python-pbr \ + python3-pbr \ " -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ " diff --git a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb new file mode 100644 index 00000000..a8fe3c01 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "OpenStack integration library between network and compute providers." +HOMEPAGE = "https://github.com/openstack/os-vif" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI = "\ + git://github.com/openstack/os-vif.git;branch=master;protocol=https \ + " + +PV = "2.2.0+git${SRCPV}" +SRCREV = "d7928102d69dadf653c9f734e5cf8fd504335849" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-netaddr \ + python3-oslo.concurrency \ + python3-oslo.config \ + python3-oslo.log \ + python3-oslo.i18n \ + python3-oslo.privsep \ + python3-six \ + python3-stevedore \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb new file mode 100644 index 00000000..b8a23fbd --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Windows / Hyper-V library for OpenStack projects." +HOMEPAGE = "https://github.com/openstack/os-win" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI = "\ + git://github.com/openstack/os-win.git;branch=master;protocol=https \ + " + +PV = "5.1.0+git${SRCPV}" +SRCREV = "066c1c49b52de17217edfdbefe9c96e457ad23d2" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-babel \ + python3-eventlet \ + python3-oslo.concurrency \ + python3-oslo.config \ + python3-oslo.log \ + python3-oslo.utils \ + python3-oslo.i18n \ + python3-greenlet \ + python3-dnspython \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb b/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb new file mode 100644 index 00000000..9055da7c --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-os-xenapi_0.3.4.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "XenAPI library for OpenStack projects." +HOMEPAGE = "https://github.com/openstack/os-xenapi" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[sha256sum] = "85d9d4bff4086a9c36eb9b2b9dfce542fa8336821a63826180dc0e8637e8ad72" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pbr \ + " + +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + bash \ + python3-pbr \ + python3-babel \ + python3-eventlet \ + python3-oslo.concurrency \ + python3-oslo.log \ + python3-oslo.utils \ + python3-oslo.i18n \ + python3-six \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb b/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb deleted file mode 100644 index 256c286d..00000000 --- a/meta-openstack/recipes-devtools/python/python3-osc-lib_1.13.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-osc-lib.inc diff --git a/meta-openstack/recipes-devtools/python/python-osc-lib.inc b/meta-openstack/recipes-devtools/python/python3-osc-lib_2.3.0.bb index 1767b434..2169e447 100644 --- a/meta-openstack/recipes-devtools/python/python-osc-lib.inc +++ b/meta-openstack/recipes-devtools/python/python3-osc-lib_2.3.0.bb @@ -4,17 +4,17 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRC_URI[md5sum] = "240d3debc1b6eaadf5e8838f5f2d06fb" -SRC_URI[sha256sum] = "3467a1edf62946f1b67724fa7f9c699b5e31d80b111ed9e4c7aec21633a3e30d" +SRC_URI[md5sum] = "0fa5c159de19e984323474321a8a02ed" +SRC_URI[sha256sum] = "ee4f8b6989d3a3fb1021a6a32665000b1db27e615a0ab5c86c35eb59c90003f1" -inherit pypi +inherit setuptools3 pypi # Satisfy setup.py 'setup_requires' DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-pbr \ ${PYTHON_PN}-six \ ${PYTHON_PN}-babel \ diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb new file mode 100644 index 00000000..5ce82ed5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "An oslo.config enabled dogpile.cache" +HOMEPAGE = "https://github.com/openstack/oslo.cache" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +PV = "2.6.1+git${SRCPV}" +SRCREV = "df075b2465195de53e42897e7d9be6c6c375ce5e" + +SRCNAME = "oslo.cache" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +# DEPENDS_default: python-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-dogpile.cache \ + python3-six \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.log \ + python3-oslo.utils \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb new file mode 100644 index 00000000..abcff6ba --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "oslo.concurrency library" +HOMEPAGE = "http://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +PV = "3.21.2+git${SRCPV}" +SRCREV = "1b25351d1c63e573068fff3d16faca440bbdcabf" + +SRCNAME = "oslo.concurrency" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-fasteners \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.utils \ + python3-six \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb b/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb new file mode 100644 index 00000000..e7557df9 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.config_8.4.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "API supporting parsing command line arguments and .ini style configuration files." +HOMEPAGE = "https://pypi.python.org/pypi/oslo.config/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" + +SRC_URI[sha256sum] = "537d62c581de2227aebfc4c71ee6fb455b853be920e0b30b65ebbe8d8128725c" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pbr \ + python3-pbr-native \ + python3-pip \ + " + +RDEPENDS:${PN} += " \ + python3-requests \ + python3-netaddr \ + python3-stevedore \ + python3-debtcollector \ + python3-oslo.i18n \ + python3-rfc3986 \ + python3-pyyaml \ + " + diff --git a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb index 42f58ace..2aa318fb 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "oslo.context" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "2.17.0+git${SRCPV}" SRCREV = "f4b6914db02e6bcf0de4a97bbc3dc85dd6e06d91" @@ -14,19 +14,19 @@ S = "${WORKDIR}/git" inherit setuptools3 DEPENDS += " \ - python-pip \ - python-pbr \ + python3-pip \ + python3-pbr \ " # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ bash \ - python-pbr \ - python-debtcollector \ - python-positional \ + python3-pbr \ + python3-debtcollector \ + python3-positional \ " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb new file mode 100644 index 00000000..0a5a05dc --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "oslo.db library" +HOMEPAGE = "http://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +PV = "8.4.0+git${SRCPV}" +SRCREV = "e42c73343f640eaacb0a76d204eb55c85de4f5d5" + +SRCNAME = "oslo.db" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-six \ + python3-alembic \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.utils \ + python3-sqlalchemy \ + python3-sqlalchemy-migrate \ + python3-stevedore \ + python3-pbr \ + python3-debtcollector \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb index 5a066226..49709d62 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb @@ -1,2 +1,34 @@ +DESCRIPTION = "oslo.i18n library" +HOMEPAGE = "http://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +PV = "5.0.1+git${SRCPV}" +SRCREV = "73187bd86903fc87665a829c9a0c714db6aa3022" + +SRCNAME = "oslo.i18n" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + inherit setuptools3 -require python-oslo.i18n.inc + +S = "${WORKDIR}/git" + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + ${PYTHON_PN}-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + ${PYTHON_PN}-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-babel \ + ${PYTHON_PN}-pbr \ + ${PYTHON_PN}-six \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb new file mode 100644 index 00000000..c702e5ca --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Oslo Log Library" +HOMEPAGE = "https://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRCNAME = "oslo.log" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" + +PV = "3.30.3+git${SRCPV}" +SRCREV = "76d1dee7b80c62172ea3900b75a47edf5b64cab4" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-babel \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + bash \ + python3-pbr \ + python3-six \ + python3-oslo.config \ + python3-oslo.context \ + python3-oslo.i18n \ + python3-oslo.utils \ + python3-oslo.serialization \ + python3-pyinotify \ + python3-debtcollector \ + python3-dateutil \ + python3-monotonic \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb new file mode 100644 index 00000000..0dc65bed --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "Oslo Messaging API" +HOMEPAGE = "https://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" + +SRCNAME = "oslo.messaging" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +PV = "12.5.0+git${SRCPV}" +SRCREV = "62e104bdb57714a0754f788795d1b4faf8ebb74d" +S = "${WORKDIR}/git" + +inherit setuptools3 + +# DEPENDS_default: python-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + bash \ + python3-pbr \ + python3-cachetools \ + python3-futurist \ + python3-oslo.log \ + python3-oslo.utils \ + python3-oslo.serialization \ + python3-oslo.middleware \ + python3-oslo.service \ + python3-oslo.i18n \ + python3-stevedore \ + python3-debtcollector \ + python3-monotonic \ + python3-six \ + python3-webob \ + python3-pyyaml \ + python3-amqp \ + python3-kombu \ + python3-pika \ + python3-pika-pool \ + python3-tenacity \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb new file mode 100644 index 00000000..51b3e7c2 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "Oslo Middleware library" +HOMEPAGE = "http://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +PV = "4.1.0+git${SRCPV}" +SRCREV = "7355d905bc0e6b7d8884e290cc26895eed0f7179" + +SRCNAME = "oslo.middleware" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-jinja2 \ + python3-oslo.config \ + python3-oslo.context \ + python3-oslo.i18n \ + python3-oslo.utils \ + python3-six \ + python3-stevedore \ + python3-webob \ + python3-debtcollector \ + python3-statsd \ + python3-monotonic \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb new file mode 100644 index 00000000..e5674328 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "Oslo Policy library" +DESCRIPTION = "The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services." +HOMEPAGE = "https://github.com/openstack/oslo.policy" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +PV = "3.3.0+git${SRCPV}" +SRCREV = "cab28649c689067970a51a2f9b329bdd6a0f0501" + +SRCNAME = "oslo.policy" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ +" + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-oslo.config \ + python3-oslo.i18n \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-six \ + python3-pyyaml \ + python3-requests \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb new file mode 100644 index 00000000..f6e51021 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "OpenStack library for privilege separation" +HOMEPAGE = "https://github.com/openstack/oslo.privsep" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRCNAME = "oslo.privsep" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +PV = "2.4.0+git${SRCPV}" +SRCREV = "512b5d9f6b79b798474d8bb2dac2462b0f705cb9" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-oslo.log \ + python3-oslo.i18n \ + python3-oslo.config \ + python3-oslo.utils \ + python3-cffi \ + python3-eventlet \ + python3-greenlet \ + python3-msgpack \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb new file mode 100644 index 00000000..1b9e4930 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "oslo.reports library" +HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +PV = "2.2.0+git${SRCPV}" +SRCREV = "bc631aedef131bc45225720e5c8f8e4ca35ff020" + +SRCNAME = "oslo.reports" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + python3-jinja2 \ + python3-psutil \ + python3-oslo.i18n \ + python3-oslo.utils \ + python3-oslo.serialization \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb new file mode 100644 index 00000000..b873afdb --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Oslo Rootwrap" +HOMEPAGE = "https://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" + +PV = "6.1.0+git${SRCPV}" +SRCREV = "ff61e1577c3aaec6242951876263108559d1a203" + +SRCNAME = "oslo.rootwrap" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb index 80b86bb1..542404a9 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRCNAME = "oslo.serialization" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "2.20.0+git${SRCPV}" SRCREV = "e56d91427c11a3813a0154d47e804018e580086e" @@ -13,23 +13,23 @@ S = "${WORKDIR}/git" inherit setuptools3 -# DEPENDS_default: python-pip +# DEPENDS_default: python3-pip DEPENDS += " \ - python-pip \ - python-pbr \ + python3-pip \ + python3-pbr \ " # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-pbr \ - python-six \ - python-oslo.utils \ - python-pytz \ - python-msgpack \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + python3-oslo.utils \ + python3-pytz \ + python3-msgpack \ " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb new file mode 100644 index 00000000..7ea4373f --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "oslo.service library" +HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +PV = "1.25.2" +SRCREV = "8481ce67951aa1b44203c03639b79e06f65bd8bc" + +SRCNAME = "oslo.service" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-webob \ + python3-eventlet \ + python3-greenlet \ + python3-monotonic \ + python3-oslo.utils \ + python3-oslo.concurrency \ + python3-oslo.config \ + python3-oslo.log \ + python3-six \ + python3-oslo.i18n \ + python3-pastedeploy \ + python3-paste \ + python3-routes \ + python3-dnspython \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb index 3b4636a8..7bec9804 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb @@ -1,2 +1,38 @@ +DESCRIPTION = "Oslo utils" +HOMEPAGE = "https://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRCNAME = "oslo.utils" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" + +PV = "3.28.0+git${SRCPV}" +SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c" +S = "${WORKDIR}/git" + +# DEPENDS_default: python3-pip inherit setuptools3 -require python-oslo.utils.inc + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + ${PYTHON_PN}-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + ${PYTHON_PN}-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pbr \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-iso8601 \ + ${PYTHON_PN}-oslo.i18n \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-netaddr \ + ${PYTHON_PN}-netifaces \ + ${PYTHON_PN}-debtcollector \ + ${PYTHON_PN}-pyparsing \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb new file mode 100644 index 00000000..b24158e3 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "oslo.versionedobjects library" +HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +PV = "2.3.0+git${SRCPV}" +SRCREV = "8db69628834332ed2df6690135be5d5c1ebd3ca1" + +SRCNAME = "oslo.versionedobjects" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-six \ + python3-oslo.concurrency \ + python3-oslo.config \ + python3-oslo.context \ + python3-oslo.messaging \ + python3-oslo.serialization \ + python3-oslo.utils \ + python3-oslo.log \ + python3-oslo.i18n \ + python3-webob \ + python3-iso8601 \ + python3-netaddr \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb new file mode 100644 index 00000000..e748a1f5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "oslo.vmware library" +HOMEPAGE = "http://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +PV = "3.4.0+git${SRCPV}" +SRCREV = "32c8d43a20cb6a29f03324fbc2e6cad3bfb5a294" + +SRCNAME = "oslo.vmware" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-stevedore \ + python3-netaddr \ + python3-six \ + python3-oslo.i18n \ + python3-oslo.utils \ + python3-oslo.concurrency \ + python3-pyyaml \ + python3-lxml \ + python3-suds-jurko \ + python3-eventlet \ + python3-requests \ + python3-urllib3 \ + " diff --git a/meta-openstack/recipes-devtools/python/python-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb index f60b3729..c4416505 100644 --- a/meta-openstack/recipes-devtools/python/python-oslotest_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb @@ -6,29 +6,34 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -PV = "2.17.0+git${SRCPV}" -SRCREV = "aea2b5cfd6442195f7ee479e21664631825af924" +PV = "2.17.2+git${SRCPV}" +SRCREV = "54ac29c3edd46530c1ee90eb860a7e686d9a3740" SRCNAME = "oslotest" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" inherit setuptools3 DEPENDS += "\ - python-pbr \ + python3-pbr \ " -RDEPENDS_${PN} = "python-fixtures \ - python-subunit \ - python-six \ - python-testrepository \ - python-testtools \ - python-mock \ - python-mox3 \ - python-os-client-config \ - python-debtcollector \ +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} = "python3-fixtures \ + python3-subunit \ + python3-six \ + python3-testrepository \ + python3-testtools \ + python3-mock \ + python3-mox3 \ + python3-os-client-config \ + python3-debtcollector \ bash \ " -
\ No newline at end of file + diff --git a/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb new file mode 100644 index 00000000..c7f84b45 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-osprofiler_3.4.0.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "OpenStack Profiler Library" +HOMEPAGE = "http://www.openstack.org/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5" + +SRC_URI[md5sum] = "691c4d2cc77e60eeaa30edd7bf087481" +SRC_URI[sha256sum] = "f7fe387f4dd681bbf92b9fbe857cc90e89cfe96d44522a2727540902310a9ed6" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + python3-oslo.messaging \ + python3-oslo.log \ + python3-oslo.utils \ + python3-webob \ + python3-requests \ + python3-netaddr \ + python3-oslo.concurrency \ + " diff --git a/meta-openstack/recipes-devtools/python/python-ovs.inc b/meta-openstack/recipes-devtools/python/python3-ovs_2.13.0.bb index d9303f28..4f372bc8 100644 --- a/meta-openstack/recipes-devtools/python/python-ovs.inc +++ b/meta-openstack/recipes-devtools/python/python3-ovs_2.13.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[md5sum] = "8551ed58f4e5878db9a599e2d7792d98" -SRC_URI[sha256sum] = "24cc9e324b03ba8d5799f07edf6c8eef013d6cbf741707f42200b1674fd60928" +SRC_URI[md5sum] = "a4a252b3c1c7d3d2d4d622179cff178e" +SRC_URI[sha256sum] = "c158aaaddbad1f122222f45def50e2bb2f9af4e21a101f5be8488da66d4391f5" -inherit pypi +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-ovs_2.7.2.bb b/meta-openstack/recipes-devtools/python/python3-ovs_2.7.2.bb deleted file mode 100644 index 9c9b82b2..00000000 --- a/meta-openstack/recipes-devtools/python/python3-ovs_2.7.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-ovs.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb index c464f2a3..b5de2621 100644 --- a/meta-openstack/recipes-devtools/python/python-ovsdbapp_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb @@ -5,28 +5,28 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "ovsdbapp" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" -PV = "0.4.1+git${SRCPV}" -SRCREV = "742754bce3c9453f8c7186455a92e4f6d6b18ace" +PV = "0.4.4+git${SRCPV}" +SRCREV = "40064ca2d99389f278028508a17f2e38d6df6f10" S = "${WORKDIR}/git" inherit setuptools3 -# DEPENDS_default: python-pip +# DEPENDS_default: python3-pip DEPENDS += " \ - python-pip \ - python-pbr \ + python3-pip \ + python3-pbr \ " # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -RDEPENDS_${PN} += " \ - python-fixtures \ - python-ovs \ - python-pbr \ +RDEPENDS:${PN} += " \ + python3-fixtures \ + python3-ovs \ + python3-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python3-pam_0.1.4.bb b/meta-openstack/recipes-devtools/python/python3-pam_0.1.4.bb index e62079f7..c6f6be9b 100644 --- a/meta-openstack/recipes-devtools/python/python3-pam_0.1.4.bb +++ b/meta-openstack/recipes-devtools/python/python3-pam_0.1.4.bb @@ -1,2 +1,10 @@ -require python-pam.inc -inherit setuptools3 +DESCRIPTION = "PAM interface using ctypes" +HOMEPAGE = "http://atlee.ca/software/pam" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://setup.py;beginline=13;endline=13;md5=8ecc573c355c5eb26b2a4a4f3f62684d" + +SRC_URI[md5sum] = "4c5247af579352bb6882dac64be10a33" +SRC_URI[sha256sum] = "35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-paramiko_2.6.0.bb b/meta-openstack/recipes-devtools/python/python3-paramiko_2.6.0.bb deleted file mode 100644 index 97e56e10..00000000 --- a/meta-openstack/recipes-devtools/python/python3-paramiko_2.6.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-paramiko.inc diff --git a/meta-openstack/recipes-devtools/python/python3-paste_2.0.2.bb b/meta-openstack/recipes-devtools/python/python3-paste_2.0.2.bb deleted file mode 100644 index c35d59e2..00000000 --- a/meta-openstack/recipes-devtools/python/python3-paste_2.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-paste.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-paste.inc b/meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb index 64ebc27c..086766d4 100644 --- a/meta-openstack/recipes-devtools/python/python-paste.inc +++ b/meta-openstack/recipes-devtools/python/python3-paste_3.5.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c PYPI_PACKAGE = "Paste" -SRC_URI[md5sum] = "4bfc8a7eaf858f6309d2ac0f40fc951c" -SRC_URI[sha256sum] = "adac3ac893a2dac6b8ffd49901377dd6819e05be3436b374d698641071daba99" +SRC_URI[md5sum] = "90c56e0f84c58ca4841c0df0bcfc11d9" +SRC_URI[sha256sum] = "1b095c42dc91d426f3ae85101796b14d265887f8f36f3aad143a5f29effdc39d" -inherit pypi +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.0.1.bb b/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.0.1.bb deleted file mode 100644 index 91c31a1a..00000000 --- a/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pastedeploy.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb b/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb new file mode 100644 index 00000000..7fc062a5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-pastedeploy_2.1.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Load, configure, and compose WSGI applications and servers" +HOMEPAGE = "http://pythonpaste.org/deploy/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=57609488f8ad28ebf6844a5169a85215" + +PYPI_PACKAGE = "PasteDeploy" + +SRC_URI[md5sum] = "f1e62dc76092433b7ae150cd81603fbd" +SRC_URI[sha256sum] = "e7559878b6e92023041484be9bcb6d767cf4492fc3de7257a5dae76a7cc11a9b" + +inherit setuptools3 pypi + +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-paste \ + ${PYTHON_PN}-setuptools \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb b/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb index afed21ec..048eeb5c 100644 --- a/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-pathlib_1.0.1.bb @@ -1,2 +1,23 @@ -require python-pathlib.inc -inherit setuptools3 +SUMMARY = "Object-oriented filesystem paths" +DESCRIPTION = "pathlib offers a set of classes to handle filesystem paths. \ +It offers the following advantages over using string objects: \ +- No more cumbersome use of os and os.path functions. \ +- Embodies the semantics of different path types. \ +- Well-defined semantics, eliminating any warts or ambiguities. \ +" +HOMEPAGE = "https://pypi.python.org/pypi/pathlib" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b6557c860f0fc867aeab30afd649753" + +SRC_URI[md5sum] = "5099ed48be9b1ee29b31c82819240537" +SRC_URI[sha256sum] = "6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f" + +inherit setuptools3 pypi + +DEPENDS += " \ + ${PYTHON_PN}-pip \ +" + +RDEPENDS:${PN} += " \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-pecan_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-pecan_1.3.3.bb deleted file mode 100644 index 2e6a223e..00000000 --- a/meta-openstack/recipes-devtools/python/python3-pecan_1.3.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pecan.inc diff --git a/meta-openstack/recipes-devtools/python/python-pecan.inc b/meta-openstack/recipes-devtools/python/python3-pecan_1.4.0.bb index 884ce753..b772ca40 100644 --- a/meta-openstack/recipes-devtools/python/python-pecan.inc +++ b/meta-openstack/recipes-devtools/python/python3-pecan_1.4.0.bb @@ -4,13 +4,16 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=d846877d24bbb3d7a00a985c90378e8c" -SRC_URI[md5sum] = "8f006ed860f7fbdf0c0bf5ad0cf2f3b4" -SRC_URI[sha256sum] = "b5461add4e3f35a7ee377b3d7f72ff13e93f40f3823b3208ab978b29bde936ff" +SRC_URI[md5sum] = "70667908b648043bc8a3fcb7d1e4d53a" +SRC_URI[sha256sum] = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a" -inherit pypi +inherit setuptools3 pypi -RDEPENDS_${PN} = "${PYTHON_PN}-mako \ +RDEPENDS:${PN} = "${PYTHON_PN}-mako \ ${PYTHON_PN}-webtest \ ${PYTHON_PN}-six \ ${PYTHON_PN}-logutils \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-backlash \ + ${PYTHON_PN}-pprint \ " diff --git a/meta-openstack/recipes-devtools/python/python3-pep8_1.7.1.bb b/meta-openstack/recipes-devtools/python/python3-pep8_1.7.1.bb deleted file mode 100644 index 64fd154e..00000000 --- a/meta-openstack/recipes-devtools/python/python3-pep8_1.7.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-pep8.inc - -SRC_URI[md5sum] = "603821d06db945c71d811b5a8d78423c" -SRC_URI[sha256sum] = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374"
\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb b/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb index 049e5213..213b55ad 100644 --- a/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb +++ b/meta-openstack/recipes-devtools/python/python3-pika-pool_0.1.3.bb @@ -1,2 +1,15 @@ -inherit setuptools3 -require python-pika-pool.inc +SUMMARY = "pools for your pikas" +HOMEPAGE = "https://github.com/bninja/pika-pool" +SECTION = "devel/python" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + +SRC_URI[md5sum] = "0a3897e991aa3da948e03660313c1980" +SRC_URI[sha256sum] = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pika \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb b/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb index 3081cd2c..d160ac92 100644 --- a/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-positional_1.2.1.bb @@ -1,2 +1,21 @@ -inherit setuptools3 -require python-positional.inc +DESCRIPTION = "Library to enforce positional or key-word arguments" +HOMEPAGE = "https://github.com/morganfainberg/positional" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5335066555b14d832335aa4660d6c376" + +SRC_URI[md5sum] = "4afcffd8e2ba733fd7a50f137a2ee893" +SRC_URI[sha256sum] = "cf48ea169f6c39486d5efa0ce7126a97bed979a52af6261cf255a41f9a74453a" + +inherit setuptools3 pypi + +CLEANBROKEN = "1" + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + ${PYTHON_PN}-pbr-native \ + " + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-wrapt \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb index 9e79b1c6..bd010aca 100644 --- a/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb +++ b/meta-openstack/recipes-devtools/python/python3-posix-ipc_1.0.4.bb @@ -1,2 +1,25 @@ -inherit setuptools3 -require python-posix-ipc.inc +DESCRIPTION = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python" +HOMEPAGE = "http://semanchuk.com/philip/posix_ipc/" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc089fb2f37e90799a54c19a20c9880f" + +PYPI_PACKAGE = "posix_ipc" + +# Archived version so we need to overwrite what the pypi class will derive +PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-${PV}.tar.gz" + +SRC_URI[md5sum] = "c4fd0065244ccb2f59cb8ceedf287cf6" +SRC_URI[sha256sum] = "ff6c9077633fc62a491d6997c43b094d885bb45a7ca1f36c9a0d647c54b74b14" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb new file mode 100644 index 00000000..4f9618d4 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "CADF Library" +HOMEPAGE = "https://launchpad.net/pycadf" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" + +PV = "3.1.0+git${SRCPV}" +SRCREV = "2402013a8719873d65136fc283e1855166adbc26" + +SRCNAME = "pycadf" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +FILES:${PN} += "${datadir}/etc/${SRCNAME}/*" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-babel \ + python3-iso8601 \ + python3-netaddr \ + python3-posix-ipc \ + python3-pytz \ + python3-six \ + python3-webob \ + python3-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-pyflakes_0.7.3.bb b/meta-openstack/recipes-devtools/python/python3-pyflakes_0.7.3.bb deleted file mode 100644 index cc9e8641..00000000 --- a/meta-openstack/recipes-devtools/python/python3-pyflakes_0.7.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pyflakes.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb b/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb new file mode 100644 index 00000000..a05712be --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-pypowervm_1.1.24.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Python binding for the PowerVM REST API" +HOMEPAGE = "https://pypi.python.org/pypi/pypowervm" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[md5sum] = "50b580055e5628aadaeb42fd69158ff8" +SRC_URI[sha256sum] = "4c6bf225d2b1022b5d363f9b3695fd1692523235d3ce1b5b4506fbc608bdb535" + +inherit setuptools3 pypi + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-lxml \ + python3-oslo.concurrency \ + python3-oslo.context \ + python3-oslo.i18n \ + python3-oslo.log \ + python3-oslo.utils \ + python3-pbr \ + python3-pyasn1-modules \ + python3-pyasn1 \ + python3-pytz \ + python3-requests \ + python3-six \ + python3-taskflow \ + python3-networkx \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb b/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb new file mode 100644 index 00000000..3e585f77 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-pysaml2_6.1.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Python implementation of SAML Version 2 to be used in a WSGI environment" +HOMEPAGE = "https://github.com/rohe/pysaml2" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=861cc9087857b5bea2e11356c3de95d9" + +inherit setuptools3 pypi + +SRC_URI[sha256sum] = "f7b80553f84bf4e3c823266d2243ab6c0303785648402fbbc1c13a14737876d4" + +DEPENDS += " \ + python3-pip \ + " + +RDEPENDS:${PN} += " \ + python3-zopeinterface \ + python3-repoze.who \ + " diff --git a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb b/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb index 60e300de..79008c63 100644 --- a/meta-openstack/recipes-devtools/python/python-pyscss_1.3.4.bb +++ b/meta-openstack/recipes-devtools/python/python3-pyscss_1.3.7.bb @@ -6,22 +6,25 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=28155276e8df3f75bbd327335f66f2fa" PYPI_PACKAGE = "pyScss" -SRC_URI[md5sum] = "9527b4864cd6023f77a8277e6fb773d7" -SRC_URI[sha256sum] = "d0323110ecc7d3ead6b99cfec31301306928130e4d0a9eb13226bf390aba8c0e" +SRC_URI[md5sum] = "c75fa4ea88d3c9df57a11679f337a939" +SRC_URI[sha256sum] = "f1df571569021a23941a538eb154405dde80bed35dc1ea7c5f3e18e0144746bf" inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ libpcre \ - python-six \ + python3-six \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ - python-enum \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-logging \ + python3-six \ + python3-numbers \ + python3-image \ " CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python3-pysnmp_4.2.5.bb b/meta-openstack/recipes-devtools/python/python3-pysnmp_4.2.5.bb deleted file mode 100644 index b31eb5ae..00000000 --- a/meta-openstack/recipes-devtools/python/python3-pysnmp_4.2.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pysnmp.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb b/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb new file mode 100644 index 00000000..c7acfaea --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-pysnmp_4.4.12.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "A pure-Python SNMPv1/v2c/v3 library" +HOMEPAGE = "https://pypi.python.org/pypi/pysnmp" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=b15d29f500f748d1c2a15709769090a8" + +SRC_URI[md5sum] = "2222880259daf6e2cb322e938c818276" +SRC_URI[sha256sum] = "0c3dbef2f958caca96071fe5c19de43e9c1b0484ab02a0cf08b190bcee768ba9" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += "${PYTHON_PN}-pycrypto \ + ${PYTHON_PN}-pyasn1 \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb deleted file mode 100644 index 4e332658..00000000 --- a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2017.7.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pytest-salt.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb new file mode 100644 index 00000000..610a27e3 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-pytest-salt_2020.1.27.bb @@ -0,0 +1,17 @@ +SUMMARY = "This pytest plugin will allow the Salt Daemons to be used in tests." +HOMEPAGE = "https://github.com/saltstack/pytest-salt" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5da5421b61b52c332140da3f2e10e40a" + +SRC_URI[md5sum] = "3d6e5d10f7c16abcfbc176b5dbb6ad36" +SRC_URI[sha256sum] = "fcc29c9e8208eda8955367c11607e72467a68564d5afbcf632b1dd6ecfbe55a1" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-tempdir \ + ${PYTHON_PN}-pytest-helpers-namespace \ + ${PYTHON_PN}-psutil \ + " diff --git a/meta-openstack/recipes-devtools/python/python-python-editor.inc b/meta-openstack/recipes-devtools/python/python3-python-editor_1.0.4.bb index 07692a37..3f4dd5da 100644 --- a/meta-openstack/recipes-devtools/python/python-python-editor.inc +++ b/meta-openstack/recipes-devtools/python/python3-python-editor_1.0.4.bb @@ -4,17 +4,13 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -PV = "0.4+git${SRCPV}" -SRCREV = "d6fa2a6bb3106a1ba00fe40f9af62e4ddc539e1e" +inherit setuptools3 pypi -SRCNAME = "python-editor" -SRC_URI = "git://github.com/fmoo/${SRCNAME}.git" - -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b" DEPENDS += " \ ${PYTHON_PN}-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-python-editor_git.bb b/meta-openstack/recipes-devtools/python/python3-python-editor_git.bb deleted file mode 100644 index 7529398a..00000000 --- a/meta-openstack/recipes-devtools/python/python3-python-editor_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-python-editor.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb b/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb index 56347b5d..cd890e0c 100644 --- a/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb +++ b/meta-openstack/recipes-devtools/python/python3-rcssmin_1.0.6.bb @@ -1,2 +1,15 @@ -require python-rcssmin.inc -inherit setuptools3 +DESCRIPTION = "RCSSmin is a CSS minifier." +HOMEPAGE = "http://opensource.perlig.de/rcssmin/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[md5sum] = "467d56503ce386c0b0e52f69ac143a9a" +SRC_URI[sha256sum] = "ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1ba18270" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + " + +CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb b/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb index 88e358d2..6de7a432 100644 --- a/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb +++ b/meta-openstack/recipes-devtools/python/python3-repoze.lru_0.7.bb @@ -1,2 +1,18 @@ -inherit setuptools3 -require python-repoze.lru.inc +SUMMARY = "A tiny LRU cache implementation and decorator" +DESCRIPTION = "repoze.lru is a LRU (least recently used) cache implementation. \ +Keys and values that are not used frequently will be evicted from the cache faster \ +than keys and values that are used frequently. \ +" +HOMEPAGE = "https://pypi.python.org/pypi/repoze.lru" +SECTION = "devel/python" +LICENSE = "BSD-Modification-copyright" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2c33cdbc6bc9ae6e5d64152fdb754292" + +SRC_URI[md5sum] = "c08cc030387e0b1fc53c5c7d964b35e2" +SRC_URI[sha256sum] = "0429a75e19380e4ed50c0694e26ac8819b4ea7851ee1fc7583c8572db80aff77" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-netclient \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-repoze.who_2.2.bb b/meta-openstack/recipes-devtools/python/python3-repoze.who_2.2.bb deleted file mode 100644 index ee7c23d1..00000000 --- a/meta-openstack/recipes-devtools/python/python3-repoze.who_2.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-repoze.who.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-repoze.who.inc b/meta-openstack/recipes-devtools/python/python3-repoze.who_2.4.bb index 1981e03a..98f24f36 100644 --- a/meta-openstack/recipes-devtools/python/python-repoze.who.inc +++ b/meta-openstack/recipes-devtools/python/python3-repoze.who_2.4.bb @@ -4,10 +4,10 @@ SECTION = "devel/python" LICENSE = "BSD-Modification" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2c33cdbc6bc9ae6e5d64152fdb754292" -SRC_URI[md5sum] = "c677ac4d4a32b6f6880a8f9cf20adffb" -SRC_URI[sha256sum] = "322629ec7c779dce4700e8f3ba531002b724d2429178c1cbb0dc169255dc9a8b" +SRC_URI[md5sum] = "5dc3b549d968a64342f3b7196477c895" +SRC_URI[sha256sum] = "cf97450de3c8eb5c03b4037be75b018db91befab1094204e452a0b1c0f7a94a6" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -15,8 +15,8 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ ${PYTHON_PN}-pip \ ${PYTHON_PN}-zopeinterface \ " diff --git a/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb index 1c049f34..0760c278 100644 --- a/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-requestsexceptions_1.4.0.bb @@ -1,2 +1,23 @@ -inherit setuptools3 -require python-requestsexceptions.inc +DESCRIPTION = "Import exceptions from potentially bundled packages in requests." +HOMEPAGE = "https://www.openstack.org/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" + +SRC_URI[md5sum] = "f43b246ccd7d5b618e6f0dc946a6c3f3" +SRC_URI[sha256sum] = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065" + +inherit setuptools3 pypi + +# conflicting file prevention +do_install:append() { + rm -f ${D}${libdir}/python*/site-packages/tests/* +} + +DEPENDS += " \ + ${PYTHON_PN}-pbr-native \ + " + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb index 9f001fe6..706f978c 100644 --- a/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb +++ b/meta-openstack/recipes-devtools/python/python3-retrying_1.3.3.bb @@ -1,2 +1,20 @@ -require python-retrying.inc -inherit setuptools3 +DESCRIPTION = "Retrying" +HOMEPAGE = "https://github.com/rholder/retrying" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" + +SRC_URI[md5sum] = "2a126aeef8b21324ecdeac15ff46ef17" +SRC_URI[sha256sum] = "08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.3.2.bb b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.3.2.bb deleted file mode 100644 index 5e91d48d..00000000 --- a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.3.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-rfc3986.inc diff --git a/meta-openstack/recipes-devtools/python/python-rfc3986.inc b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb index d930fd9c..d338a9e4 100644 --- a/meta-openstack/recipes-devtools/python/python-rfc3986.inc +++ b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Validating URI References per RFC 3986" HOMEPAGE = "https://rfc3986.rtfd.org" SECTION = "devel/python" -LICENSE = "Apache-2" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=03731a0e7dbcb30cecdcec77cc93ec29" -SRC_URI[md5sum] = "5b6d009806a94d418c82d48219a256de" -SRC_URI[sha256sum] = "0344d0bd428126ce554e7ca2b61787b6a28d2bbd19fc70ed2dd85efe31176405" +SRC_URI[md5sum] = "1b03ad2853e33d47eea698571255247c" +SRC_URI[sha256sum] = "112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -15,6 +15,6 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-rjsmin_1.0.12.bb b/meta-openstack/recipes-devtools/python/python3-rjsmin_1.0.12.bb deleted file mode 100644 index 9890e14b..00000000 --- a/meta-openstack/recipes-devtools/python/python3-rjsmin_1.0.12.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-rjsmin.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-rjsmin.inc b/meta-openstack/recipes-devtools/python/python3-rjsmin_1.1.0.bb index 0305a333..15bba293 100644 --- a/meta-openstack/recipes-devtools/python/python-rjsmin.inc +++ b/meta-openstack/recipes-devtools/python/python3-rjsmin_1.1.0.bb @@ -4,12 +4,12 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[md5sum] = "9f67e133c88df5497d3da847603da9bf" -SRC_URI[sha256sum] = "dd9591aa73500b08b7db24367f8d32c6470021f39d5ab4e50c7c02e4401386f1" +SRC_URI[md5sum] = "ff73482370832bcc8e75571c35b7a79b" +SRC_URI[sha256sum] = "b15dc75c71f65d9493a8c7fa233fdcec823e3f1b88ad84a843ffef49b338ac32" -inherit pypi +inherit setuptools3 pypi -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb b/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb new file mode 100644 index 00000000..413ac477 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-routes_2.5.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A Python re-implementation of the Rails routes system." +HOMEPAGE = "http://routes.groovie.org" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=90976c1a0e3029278f882cfe2e84a6ae" + +SRC_URI[sha256sum] = "b6346459a15f0cbab01a45a90c3d25caf980d4733d628b4cc1952b865125d053" + +PYPI_PACKAGE = "Routes" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-repoze.lru \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-routes_git.bb b/meta-openstack/recipes-devtools/python/python3-routes_git.bb deleted file mode 100644 index 06dd1ad7..00000000 --- a/meta-openstack/recipes-devtools/python/python3-routes_git.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-routes.inc diff --git a/meta-openstack/recipes-devtools/python/python3-rsa_3.4.2.bb b/meta-openstack/recipes-devtools/python/python3-rsa_3.4.2.bb deleted file mode 100644 index 2d6c93ce..00000000 --- a/meta-openstack/recipes-devtools/python/python3-rsa_3.4.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-rsa.inc diff --git a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.51.bb b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.51.bb deleted file mode 100644 index 571b68c6..00000000 --- a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.51.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-rtslib-fb.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb new file mode 100644 index 00000000..644c3de7 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "API for Linux kernel SCSI target (aka LIO)" +HOMEPAGE = "http://github.com/agrover/rtslib-fb" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cf391b108961d84a581f45259ec47c52" + +SRC_URI[md5sum] = "85ab011e3a98fb585d8a0fb337c5dab4" +SRC_URI[sha256sum] = "6f15bc30b55e0d35f29edde4f35880965b2f1e9acee1424e6e9820f32b0a925c" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-pyudev \ + ${PYTHON_PN}-resource \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb index 806cd767..7dfd0f82 100644 --- a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb @@ -1,2 +1,30 @@ -require python-saharaclient.inc +DESCRIPTION = "CLI and python client library for OpenStack Sahara" +HOMEPAGE = "https://launchpad.net/sahara" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + ${PYTHON_PN}-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + ${PYTHON_PN}-pbr-native \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pbr \ + " + +SRCNAME = "saharaclient" + inherit setuptools3 + +SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master;protocol=https" + +PV = "3.2.1+git${SRCPV}" +SRCREV = "a9fee07108c432e20a3ca7760541d4fcb4f14811" +S = "${WORKDIR}/git" + diff --git a/meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch b/meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch index e86768a1..f1628a3d 100644 --- a/meta-openstack/recipes-devtools/python/python-salttesting/0001-Add-ptest-output-option-to-test-suite.patch +++ b/meta-openstack/recipes-devtools/python/python3-salttesting/0001-Add-ptest-output-option-to-test-suite.patch @@ -1,6 +1,6 @@ -From 1950b943b7173198f345a1cff7b7f771cbac2244 Mon Sep 17 00:00:00 2001 -From: Collin Richards <collin.richards@ni.com> -Date: Tue, 28 Jun 2016 16:02:22 -0500 +From 61ba63c3cde920873b8df48b950b8ebb79158346 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Thu, 19 Nov 2020 11:20:58 +0900 Subject: [PATCH] Add ptest output option to test suite Extend salttesting to support outputing the results of running the test @@ -9,26 +9,28 @@ suite in ptest format. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Collin Richards <collin.richards@ni.com> +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> + Natinst-ReviewBoard-ID: 143279 --- salttesting/parser/__init__.py | 12 +++ - salttesting/ptest.py | 165 +++++++++++++++++++++++++++++++++++++++++ + salttesting/ptest.py | 165 +++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 salttesting/ptest.py diff --git a/salttesting/parser/__init__.py b/salttesting/parser/__init__.py -index 1e7275b..d8cba0c 100644 +index d752acf..b41e5ea 100644 --- a/salttesting/parser/__init__.py +++ b/salttesting/parser/__init__.py -@@ -25,6 +25,7 @@ from functools import partial - from contextlib import closing +@@ -28,6 +28,7 @@ from contextlib import closing + import six from salttesting import TestLoader, TextTestRunner +from salttesting.ptest import PTestRunner + from salttesting import helpers from salttesting.version import __version_info__ from salttesting.xmlunit import HAS_XMLRUNNER, XMLTestRunner - try: -@@ -264,6 +265,12 @@ class SaltTestingParser(optparse.OptionParser): +@@ -277,6 +278,12 @@ class SaltTestingParser(optparse.OptionParser): action='store_true', help='Do NOT show the overall tests result' ) @@ -41,7 +43,7 @@ index 1e7275b..d8cba0c 100644 self.add_option_group(self.output_options_group) self.fs_cleanup_options_group = optparse.OptionGroup( -@@ -491,6 +498,11 @@ class SaltTestingParser(optparse.OptionParser): +@@ -531,6 +538,11 @@ class SaltTestingParser(optparse.OptionParser): verbosity=self.options.verbosity ).run(tests) self.testsuite_results.append((header, runner)) @@ -225,5 +227,5 @@ index 0000000..4c50f57 + self.stream.writeln() + return result -- -2.13.2 +2.25.1 diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb new file mode 100644 index 00000000..51cf18ec --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Common testing tools used in the Salt Stack projects" +HOMEPAGE = "https://github.com/saltstack/salt-testing" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5" + +SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop;protocol=https \ + file://0001-Add-ptest-output-option-to-test-suite.patch \ + " + +SRCREV = "8d21627a4eef316d22cc424deeca16a0ec8472e9" +PV = "2018.9.21+git${SRCPV}" + +S = "${WORKDIR}/git" + +RDEPENDS:${PN} = "\ + python3-mock \ + python3-unittest \ +" + +inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-semantic-version_2.4.2.bb b/meta-openstack/recipes-devtools/python/python3-semantic-version_2.4.2.bb deleted file mode 100644 index f4191f55..00000000 --- a/meta-openstack/recipes-devtools/python/python3-semantic-version_2.4.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-semantic-version.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-semantic-version_2.8.5.bb b/meta-openstack/recipes-devtools/python/python3-semantic-version_2.8.5.bb new file mode 100644 index 00000000..b91b655d --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-semantic-version_2.8.5.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "A library which provides a few tools to handle SemVer in Python." +HOMEPAGE = "http://pypi.python.org/pypi/semantic_version" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fb31e3c1c7eeb8b5e8c07657cdd54e2" + +PYPI_PACKAGE = "semantic_version" + +SRC_URI[md5sum] = "76d7364def7ee487b6153d40b13de904" +SRC_URI[sha256sum] = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54" + +inherit setuptools3 pypi + diff --git a/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb b/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb index 5dd6804a..98fec91f 100644 --- a/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb @@ -1,2 +1,16 @@ -inherit setuptools3 -require python-setuptools-git.inc +DESCRIPTION = "Plugin for setuptools that enables git integration" +HOMEPAGE = "https://github.com/wichert/setuptools-git" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3775480a712fc46a69647678acb234cb" + +SRC_URI[md5sum] = "40b2ef7687a384ea144503c2e5bc67e2" +SRC_URI[sha256sum] = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445" + +inherit setuptools3 pypi + +# conflicting file prevention +do_install:append() { + rm -f ${D}${libdir}/python*/site-packages/site.py* +} +BBCLASSEXTEND = "native" diff --git a/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb b/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb index 56ad2213..a9609264 100644 --- a/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb @@ -1,2 +1,12 @@ -inherit setuptools3 -require python-simplegeneric.inc +DESCRIPTION = "Simple generic functions" +HOMEPAGE = "https://pypi.python.org/pypi/simplegeneric/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.txt;md5=2085f2c228ed80422edf70e52e86c34b" + +PYPI_PACKAGE_EXT = "zip" + +SRC_URI[md5sum] = "f9c1fab00fd981be588fc32759f474e3" +SRC_URI[sha256sum] = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-singledispatch_3.4.0.3.bb b/meta-openstack/recipes-devtools/python/python3-singledispatch_3.4.0.3.bb index 0f4b4834..975d308b 100644 --- a/meta-openstack/recipes-devtools/python/python3-singledispatch_3.4.0.3.bb +++ b/meta-openstack/recipes-devtools/python/python3-singledispatch_3.4.0.3.bb @@ -1,2 +1,10 @@ -require python-singledispatch.inc -inherit setuptools3 +DESCRIPTION = "functools.singledispatch from Python 3.4 to Python 2.6" +HOMEPAGE = "https://pypi.python.org/pypi/singledistpatch" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=ee3cd67264adc7eb07981f3644dc17dc" + +SRC_URI[md5sum] = "af2fc6a3d6cc5a02d0bf54d909785fcb" +SRC_URI[sha256sum] = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.13.0.bb b/meta-openstack/recipes-devtools/python/python3-sqlalchemy-migrate_0.13.0.bb index d99f638c..32685ef4 100644 --- a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.13.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-sqlalchemy-migrate_0.13.0.bb @@ -13,15 +13,15 @@ inherit setuptools3 # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ + python3-pbr-native \ " -RDEPENDS_${PN} += " \ - python-pbr \ - python-sqlalchemy \ - python-decorator \ - python-six \ - python-sqlparse \ - python-tempita \ +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-sqlalchemy \ + python3-decorator \ + python3-six \ + python3-sqlparse \ + python3-tempita \ " diff --git a/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb b/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb index 3e430a12..96ef9493 100644 --- a/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-statsd_3.3.0.bb @@ -1,2 +1,13 @@ -inherit setuptools3 -require python-statsd.inc +DESCRIPTION = "A simple statsd client." +HOMEPAGE = "https://github.com/jsocol/pystatsd" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4d8aa8ac1dc54b8aee4054bd5e5c61bd" + +inherit setuptools3 pypi + +SRC_URI[md5sum] = "b397ccf880f37cf099e775907ebf7a46" +SRC_URI[sha256sum] = "e3e6db4c246f7c59003e51c9720a51a7f39a396541cb9b147ff4b14d15b5dd1f" + +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python-subunit_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-subunit_1.4.0.bb index c18d1c4a..02a6b2e9 100644 --- a/meta-openstack/recipes-devtools/python/python-subunit_1.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-subunit_1.4.0.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Python implementation of subunit test streaming protocol" HOMEPAGE = "https://pypi.python.org/pypi/python-subunit/" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README;md5=e5b524e1b2c67c88fc64439ee4a850aa" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b5969d1df4dc7ff4882889baa132a694" PYPI_PACKAGE = "python-subunit" -SRC_URI[md5sum] = "d2c09c93346077ced675c9f718e6a0f1" -SRC_URI[sha256sum] = "d9a7606e9610828d68c1d2f0f5abbb421e34e518b8f4882c8b2e08176281bf88" +SRC_URI[md5sum] = "30f1ab20651d94442dd9a7f8c9e8d633" +SRC_URI[sha256sum] = "042039928120fbf392e8c983d60f3d8ae1b88f90a9f8fd7188ddd9c26cad1e48" inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb b/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb index d230c8de..a590cfb3 100644 --- a/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb +++ b/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb @@ -1,3 +1,20 @@ -inherit setuptools3 -require python-suds-jurko.inc +DESCRIPTION = "Lightweight SOAP client (Jurko's fork)" +HOMEPAGE = "https://bitbucket.org/jurko/suds" +SECTION = "devel/python" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=847e96bce86d8774f491a92924343a29" + +PYPI_PACKAGE_EXT = "tar.bz2" + +SRC_URI[md5sum] = "1309e9bc2454aa3434041f0a24ae4e11" +SRC_URI[sha256sum] = "29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb b/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb new file mode 100644 index 00000000..6ca61549 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-swiftclient_3.10.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Client library for OpenStack Object Storage API" +HOMEPAGE = "https://github.com/openstack/python-swiftclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +PYPI_PACKAGE = "python-swiftclient" + +SRC_URI[sha256sum] = "66227eaf29a691c70675fb9982022980b92797c273dd5e6dc7e680425e9a3634" + +inherit pypi setuptools3 python3-dir + +do_install:append() { + cp -r test ${D}/${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/ +} + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-simplejson \ + python3-pbr \ + python3-requests \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-sysv-ipc_0.6.8.bb b/meta-openstack/recipes-devtools/python/python3-sysv-ipc_0.6.8.bb deleted file mode 100644 index 0e3dcd1f..00000000 --- a/meta-openstack/recipes-devtools/python/python3-sysv-ipc_0.6.8.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-sysv-ipc.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb b/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb new file mode 100644 index 00000000..3b0bb8b5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-sysv-ipc_1.0.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "System V IPC primitives (semaphores, shared memory and message queues) for Python" +HOMEPAGE = "http://semanchuk.com/philip/sysv_ipc/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=4f09db8030b38bf57a442088a5a521ff" + +PYPI_PACKAGE = "sysv_ipc" + +SRC_URI[md5sum] = "9ef5167ed58a5a09e637cdfaeb8099d7" +SRC_URI[sha256sum] = "8eff10dd17789ddf21b422ce46ae0f6420088902a88e4296cb805cf2fde8b4dc" + +inherit setuptools3 pypi + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb new file mode 100644 index 00000000..193f80e7 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "A library to complete workflows/tasks in HA manner" +HOMEPAGE = "https://wiki.openstack.org/wiki/TaskFlow" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" + +SRC_URI = "\ + git://git.openstack.org/openstack/taskflow.git;branch=stable/pike \ + " + +PV="2.14.1+git${SRCPV}" +SRCREV="ed867c4fd17e4102a133c313a13af37baccf14a4" +S = "${WORKDIR}/git" + +inherit setuptools3 + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-six \ + python3-futurist \ + python3-fasteners \ + python3-networkx \ + python3-contextlib2 \ + python3-stevedore \ + python3-jsonschema \ + python3-automaton \ + python3-oslo.utils \ + python3-oslo.serialization \ + python3-tenacity \ + python3-cachetools \ + python3-debtcollector \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-tempita_0.5.3dev.bb b/meta-openstack/recipes-devtools/python/python3-tempita_0.5.3dev.bb index a0123a69..140b334d 100644 --- a/meta-openstack/recipes-devtools/python/python3-tempita_0.5.3dev.bb +++ b/meta-openstack/recipes-devtools/python/python3-tempita_0.5.3dev.bb @@ -1,2 +1,12 @@ -require python-tempita.inc -inherit setuptools3 +DESCRIPTION = "A very small text templating language" +HOMEPAGE = "http://pythonpaste.org/tempita/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://setup.py;beginline=33;endline=33;md5=2d33c00f47720c7e35e1fdb4b9fab027" + +PYPI_PACKAGE = "Tempita" + +SRC_URI[md5sum] = "365c3b4f36435e2178902d5619301140" +SRC_URI[sha256sum] = "38392bb708a10128419f75fa9120a6d2c8d137013b353968e5008a77a5c7a2ca" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python-tenacity_5.1.1.bb b/meta-openstack/recipes-devtools/python/python3-tenacity_6.2.0.bb index bbe62f5e..0e5069aa 100644 --- a/meta-openstack/recipes-devtools/python/python-tenacity_5.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-tenacity_6.2.0.bb @@ -6,19 +6,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" inherit pypi -SRC_URI[md5sum] = "c960e3f0c66207c85bbae72a8232278b" -SRC_URI[sha256sum] = "a4eb168dbf55ed2cae27e7c6b2bd48ab54dabaf294177d998330cf59f294c112" +SRC_URI[md5sum] = "41e4e17cdedfa95fa626e528f596e151" +SRC_URI[sha256sum] = "29ae90e7faf488a8628432154bb34ace1cca58244c6ea399fd33f066ac71339a" inherit setuptools3 # Satisfy setup.py 'setup_requires' DEPENDS += " \ - python-pbr-native \ - python-setuptools3-scm-native \ + python3-pbr-native \ + python3-setuptools-scm-native \ " -RDEPENDS_${PN} += " \ - python-six \ - python-futures \ - python-monotonic \ +RDEPENDS:${PN} += " \ + python3-six \ + python3-monotonic \ " diff --git a/meta-openstack/recipes-devtools/python/python-termcolor_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb index 8c590497..127287a7 100644 --- a/meta-openstack/recipes-devtools/python/python-termcolor_1.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d" SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df" SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b" -inherit distutils3 pypi +inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " diff --git a/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb b/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb index a01b4c2b..eb5e8d0e 100644 --- a/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb +++ b/meta-openstack/recipes-devtools/python/python3-testrepository_0.0.20.bb @@ -1,3 +1,17 @@ -require python-testrepository.inc -inherit setuptools3 +DESCRIPTION = "A repository of test results" +HOMEPAGE = "https://pypi.python.org/pypi/testrepository/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=f19071a777e237c55ec3ab83284b31b8" + +SRC_URI[md5sum] = "f648b0aceeca4fcd5f8a62eeedea289b" +SRC_URI[sha256sum] = "752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += "${PYTHON_PN}-subunit \ + ${PYTHON_PN}-extras \ +" + +CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python3-testresources_0.2.7.bb b/meta-openstack/recipes-devtools/python/python3-testresources_0.2.7.bb deleted file mode 100644 index 79a535c7..00000000 --- a/meta-openstack/recipes-devtools/python/python3-testresources_0.2.7.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-testresources.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb b/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb new file mode 100644 index 00000000..ee34c3d8 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-testresources_2.0.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Testresources, a pyunit extension for managing expensive test resources" +HOMEPAGE = "https://pypi.python.org/pypi/testtools/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=eb75e5ad7c7ff3315ffafae1403e94b2" + +SRC_URI[md5sum] = "8873ab443db5569528964f524228a2d7" +SRC_URI[sha256sum] = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pbr-native \ +" + +RDEPENDS:${PN} += " \ + python3-unittest \ + python3-pbr \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb b/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb index 6f7d418f..79b03fb7 100644 --- a/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-testscenarios_0.5.0.bb @@ -1,2 +1,24 @@ -inherit setuptools3 -require python-testscenarios.inc +DESCRIPTION = "testscenarios: a pyunit extension for dependency injection" +HOMEPAGE = "https://pypi.python.org/pypi/testscenarios" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://BSD;md5=0805e4f024d089a52dca0671a65b8b66" + +SRC_URI[md5sum] = "859073d9e7b049aee2e6704c51f6001a" +SRC_URI[sha256sum] = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6" + +inherit setuptools3 pypi + +DEPENDS += "\ + ${PYTHON_PN}-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + ${PYTHON_PN}-pbr-native \ + " + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-testtools \ + ${PYTHON_PN}-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-testtools_2.3.0.bb b/meta-openstack/recipes-devtools/python/python3-testtools_2.3.0.bb deleted file mode 100644 index 896ecee6..00000000 --- a/meta-openstack/recipes-devtools/python/python3-testtools_2.3.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-testtools.inc diff --git a/meta-openstack/recipes-devtools/python/python3-thrift_0.9.2.bb b/meta-openstack/recipes-devtools/python/python3-thrift_0.9.2.bb index 095dcba5..ec76885f 100644 --- a/meta-openstack/recipes-devtools/python/python3-thrift_0.9.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-thrift_0.9.2.bb @@ -1,2 +1,10 @@ -require python-thrift.inc -inherit setuptools3 +DESCRIPTION = "Python bindings for the Apache Thrift RPC system" +HOMEPAGE = "https://pypi.python.org/pypi/amqp/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=df17a59cc9e1327ec49c2285e13ac477" + +SRC_URI[md5sum] = "91f1c224c46a257bb428431943387dfd" +SRC_URI[sha256sum] = "08f665e4b033c9d2d0b6174d869273104362c80e77ee4c01054a74141e378afa" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb b/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb new file mode 100644 index 00000000..e86041d0 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-tinyrpc_1.0.4.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A small, modular, transport and protocol neutral \ +RPC library that, among other things, supports JSON-RPC and zmq." +HOMEPAGE = "http://github.com/mbr/tinyrpc" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI[md5sum] = "cd61e3cbc01ea940abc97d3a87abf4a7" +SRC_URI[sha256sum] = "4b41fab967fb1c978f573bf0d609a3b12cc3b6ed62bd3108f43f575563746396" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-six \ + python3-gevent \ + python3-requests \ + python3-websocket-client \ + python3-jsonext \ + python3-gevent-websocket \ + python3-werkzeug \ + python3-pyzmq \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb b/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb new file mode 100644 index 00000000..c48e1ef3 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-tooz_2.7.1.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Coordination library for distributed systems." +HOMEPAGE = "https://pypi.python.org/pypi/tooz" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" + +SRC_URI[md5sum] = "f8afa62d566f602d63050850d4873583" +SRC_URI[sha256sum] = "bee07684b12e9fb06adbe6b1a5ddb60ef9e8dc20f5a2d46e667d8797028bcfe5" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + python3-pbr \ + python3-stevedore \ + python3-six \ + python3-voluptuous \ + python3-msgpack \ + python3-fasteners \ + python3-tenacity \ + python3-futurist \ + python3-oslo.utils \ + python3-oslo.serialization \ + " diff --git a/meta-openstack/recipes-devtools/python/python-trollius_git.bb b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb index 3e15f5f1..12941baa 100644 --- a/meta-openstack/recipes-devtools/python/python-trollius_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb @@ -4,19 +4,19 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=8f7bb094c7232b058c7e9f2e431f389c" -PV = "2.0+git${SRCPV}" -SRCREV = "5e9854d7b7bed6eb6e182808379342355e2bfca4" +PV = "3.4.3+git${SRCPV}" +SRCREV = "7b2d8abfce1d7ef18ef516f9b1b7032172630375" SRCNAME = "trollius" -SRC_URI = "git://github.com/haypo/${SRCNAME}.git;branch=trollius" +SRC_URI = "git://github.com/haypo/${SRCNAME}.git;branch=trollius;protocol=https" S = "${WORKDIR}/git" inherit setuptools3 DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb b/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb new file mode 100644 index 00000000..b11c3d85 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-unicodecsv_0.14.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Python2's stdlib csv module replacement with unicode support" +HOMEPAGE = "https://github.com/jdunck/python-unicodecsv" +SECTION = "devel/python" +LICENSE = "BSD" + +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=776dee90d219355b4ffd5c06fda5a39d" + +SRC_URI[sha256sum] = "018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pbr \ + " + +RDEPENDS:${PN} += " \ + " + diff --git a/meta-openstack/recipes-devtools/python/python3-uritemplate_3.0.0.bb b/meta-openstack/recipes-devtools/python/python3-uritemplate_3.0.0.bb deleted file mode 100644 index eac83dce..00000000 --- a/meta-openstack/recipes-devtools/python/python3-uritemplate_3.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-uritemplate.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-vine_1.1.4.bb b/meta-openstack/recipes-devtools/python/python3-vine_1.1.4.bb deleted file mode 100644 index 59267020..00000000 --- a/meta-openstack/recipes-devtools/python/python3-vine_1.1.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit setuptools3 -require python-vine.inc - diff --git a/meta-openstack/recipes-devtools/python/python-vine.inc b/meta-openstack/recipes-devtools/python/python3-vine_5.0.0.bb index f098a9d9..bea33bc9 100644 --- a/meta-openstack/recipes-devtools/python/python-vine.inc +++ b/meta-openstack/recipes-devtools/python/python3-vine_5.0.0.bb @@ -4,10 +4,10 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=6fadb0e48ceb84b571372dd706ed76a0" -SRC_URI[md5sum] = "9fdb971e7fd15b181b84f3bfcf20d11c" -SRC_URI[sha256sum] = "52116d59bc45392af9fdd3b75ed98ae48a93e822cee21e5fda249105c59a7a72" +SRC_URI[md5sum] = "2fc3270a999cdc9341ba173360d62367" +SRC_URI[sha256sum] = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e" -inherit pypi +inherit setuptools3 pypi -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-voluptuous_0.10.5.bb b/meta-openstack/recipes-devtools/python/python3-voluptuous_0.10.5.bb deleted file mode 100644 index a8696087..00000000 --- a/meta-openstack/recipes-devtools/python/python3-voluptuous_0.10.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-voluptuous.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-voluptuous.inc b/meta-openstack/recipes-devtools/python/python3-voluptuous_0.12.0.bb index 7537aee4..3e77e306 100644 --- a/meta-openstack/recipes-devtools/python/python-voluptuous.inc +++ b/meta-openstack/recipes-devtools/python/python3-voluptuous_0.12.0.bb @@ -4,10 +4,10 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=9855ba150f2edb00d8e7a41554896ffb" -SRC_URI[md5sum] = "e3fc99b75618d384cad63bc71b6507bc" -SRC_URI[sha256sum] = "7a7466f8dc3666a292d186d1d871a47bf2120836ccb900d5ba904674957a2396" +SRC_URI[md5sum] = "4b628978d320baeee543ee407aefc0b1" +SRC_URI[sha256sum] = "3a4ef294e16f6950c79de4cba88f31092a107e6e3aaa29950b43e2bb9e1bb2dc" -inherit pypi +inherit setuptools3 pypi -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb index 7f4d3508..219e1594 100644 --- a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb +++ b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb @@ -1,3 +1,17 @@ -inherit setuptools3 -require python-warlock.inc +DESCRIPTION = "Build self-validating python objects using JSON schemas" +HOMEPAGE = "http://github.com/bcwaldon/warlock" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS += "python3-jsonschema python3-jsonpatch" + +SRC_URI[md5sum] = "746aba989d97762948e5fca6601f283f" +SRC_URI[sha256sum] = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "${PYTHON_PN}-jsonschema \ + ${PYTHON_PN}-jsonpatch \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb b/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb index 23dbb547..445d266d 100644 --- a/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb +++ b/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb @@ -1,2 +1,10 @@ -require python-weakrefmethod.inc -inherit setuptools3 +DESCRIPTION = "A WeakMethod class for storing bound methods using weak references." +HOMEPAGE = "https://github.com/twang817/weakrefmethod" +SECTION = "devel/python" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" + +SRC_URI[md5sum] = "39e7450191dea0b17a646b929784ac6f" +SRC_URI[sha256sum] = "37bc1fbb5575acf82172d4eb7b6fc4412d77d5a1d70dff2c1f8a4574301cda66" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb new file mode 100644 index 00000000..84e3f72b --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "WebSockets support for any application/server" +HOMEPAGE = "https://github.com/kanaka/websockify" +SECTION = "devel/python" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=eb81922f483833198eace60f1469f99d" + +SRC_URI[md5sum] = "ff745fd67457fd077915753c9b808b2a" +SRC_URI[sha256sum] = "c35b5b79ebc517d3b784dacfb993be413a93cda5222c6f382443ce29c1a6cada" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += "gmp" + +FILES:${PN} += "${datadir}/*" diff --git a/meta-openstack/recipes-devtools/python/python3-webtest_2.0.33.bb b/meta-openstack/recipes-devtools/python/python3-webtest_2.0.33.bb deleted file mode 100644 index aaf0b42d..00000000 --- a/meta-openstack/recipes-devtools/python/python3-webtest_2.0.33.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 pypi -require python-webtest.inc diff --git a/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb b/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb new file mode 100644 index 00000000..dab1c593 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-webtest_2.0.35.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Helper to test WSGI applications" +HOMEPAGE = "https://pypi.python.org/pypi/WebTest/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=e3e00192f000e33de99fd5a3cb32a8fc" + +PYPI_PACKAGE = "WebTest" + +RDEPENDS:${PN} += "${PYTHON_PN}-beautifulsoup4" + +SRC_URI[md5sum] = "a5d027ffa0991fdf20e305c62bd37791" +SRC_URI[sha256sum] = "aac168b5b2b4f200af4e35867cf316712210e3d5db81c1cbdff38722647bb087" + +RDEPENDS:${PN} += " \ + python3-html \ + python3-logging \ + python3-webob \ +" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-wsgiref_0.1.2.bb b/meta-openstack/recipes-devtools/python/python3-wsgiref_0.1.2.bb deleted file mode 100644 index 0fa887af..00000000 --- a/meta-openstack/recipes-devtools/python/python3-wsgiref_0.1.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-wsgiref.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-wsme.inc b/meta-openstack/recipes-devtools/python/python3-wsme_0.10.0.bb index b402a099..2f5fa1f7 100644 --- a/meta-openstack/recipes-devtools/python/python-wsme.inc +++ b/meta-openstack/recipes-devtools/python/python3-wsme_0.10.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5a9126e7f56a0cf3247050de7f10d0f4" PYPI_PACKAGE = "WSME" -SRC_URI[md5sum] = "e6cb3864bae872acaa0cd0c2efacc94f" -SRC_URI[sha256sum] = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a" +SRC_URI[md5sum] = "7e5d5c6dbee2ad1e82c518ef3bfdf108" +SRC_URI[sha256sum] = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304" DEPENDS += " \ ${PYTHON_PN}-pip \ @@ -19,6 +19,12 @@ DEPENDS += " \ ${PYTHON_PN}-pbr-native \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PYTHON_PN}-pbr \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-netaddr \ + ${PYTHON_PN}-webob \ " + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/python/python3-wsme_0.9.3.bb b/meta-openstack/recipes-devtools/python/python3-wsme_0.9.3.bb deleted file mode 100644 index f792d0ed..00000000 --- a/meta-openstack/recipes-devtools/python/python3-wsme_0.9.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 pypi -require python-wsme.inc diff --git a/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb b/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb new file mode 100644 index 00000000..521fd713 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-xattr_0.9.7.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Python wrapper for extended filesystem attributes" +HOMEPAGE = "http://github.com/xattr/xattr" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ebb582f22ddff5dcb0bc33d04f7cbb8" + +SRC_URI[md5sum] = "3b9a928bc76c14eeeaccbc3c152c4920" +SRC_URI[sha256sum] = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-cffi-native \ +" + +RDEPENDS:${PN} += " \ + python3-cffi \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.2.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.2.0.0.bb deleted file mode 100644 index 622f1528..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.2.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-bootstrap.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.5.0.0.bb index 1a380679..225ac6de 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-bootstrap.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-bootstrap_2.5.0.0.bb @@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PYPI_PACKAGE = "XStatic-Angular-Bootstrap" -SRC_URI[md5sum] = "1d7d02580f022c36628f99fbf40e39c9" -SRC_URI[sha256sum] = "61b0a86aad66bf0d333ed24496f51d77cb20ad5bf664140d86e880b15a231166" +SRC_URI[md5sum] = "cb8629df48e822255d1057a2bc624cb6" +SRC_URI[sha256sum] = "be60686c9a29c74ceeadd787969c2bcbce39f15b30daa4949574aeca602f9f35" -inherit pypi +inherit setuptools3 pypi DEPENDS += " \ ${PYTHON_PN}-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb index ee9591a8..d874ca74 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-cookies_1.2.1.1.bb @@ -1,2 +1,22 @@ -require python-xstatic-angular-cookies.inc -inherit setuptools3 +DESCRIPTION = "Angular-Cookies JavaScript library packaged for setuptools" +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Cookies" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=70856f1d03d62a3e0c0cb1b7f8c7fd00" + +PYPI_PACKAGE = "XStatic-Angular-Cookies" + +SRC_URI[md5sum] = "a67066fac5dfe9774ab163d44e5a896a" +SRC_URI[sha256sum] = "c8fc1a52549c601809fc9f25144e4fd346820412b6430e89256e7ec71fce0b4c" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb index 644a6312..cd97fd93 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-fileupload_12.0.4.0.bb @@ -1,2 +1,22 @@ -require python-xstatic-angular-fileupload.inc -inherit setuptools3 +DESCRIPTION = "Angular Fileupload packaged for setuptools (easy_install) / pip." +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-FileUpload" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e634b82c14383ecefd736caa40ed2222" + +PYPI_PACKAGE = "XStatic-Angular-FileUpload" + +SRC_URI[md5sum] = "1cf48c0204783da2f71efe79039a8468" +SRC_URI[sha256sum] = "68e66efc4f2ed81438553a54646d5cc67487b05764c0003ff25ae5beb8dae21f" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.3.8.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.3.8.0.bb deleted file mode 100644 index 48b75aac..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.3.8.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-angular-gettext.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.4.1.0.bb index be9cce39..172f4cf0 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-gettext.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-gettext_2.4.1.0.bb @@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PYPI_PACKAGE = "XStatic-Angular-Gettext" -SRC_URI[md5sum] = "de55242cf5dc5fa712ac7e4a53aeb12b" -SRC_URI[sha256sum] = "18db14dccaae5d64a9b66d08d0134b6c154fc1fb1e216964bba8e403e03c870e" +SRC_URI[md5sum] = "6552973138d37609c776d2d8a049aabe" +SRC_URI[sha256sum] = "883192c9273b2d1b8dc69e605845f0d3a267698955e55dcde0e3a4defeae385b" -inherit pypi +inherit setuptools3 pypi DEPENDS += " \ ${PYTHON_PN}-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb index 72c8781e..e7b09ce2 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-irdragndrop_1.0.2.2.bb @@ -1,2 +1,19 @@ -require python-xstatic-angular-irdragndrop.inc -inherit setuptools3 +DESCRIPTION = "IrDragNDrop javascript library packaged for setuptools" +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-IrDragNDrop" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9acc2dfc3a0345c175df08104bd22298" + +PYPI_PACKAGE = "XStatic-Angular-IrDragNDrop" + +SRC_URI[md5sum] = "6ea8809bae94014aef699d58836dba84" +SRC_URI[sha256sum] = "5595f4a98ac8f8468f7e56dc916e10c0fc5f0197567899a75755f99fe8b5bd6d" + +inherit setuptools3 pypi + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-lrdragndrop_1.0.2.4.bb index c754ef4f..10e7bf28 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-lrdragndrop_1.0.2.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-lrdragndrop_1.0.2.4.bb @@ -2,18 +2,18 @@ DESCRIPTION = "LrDragNDrop javascript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-lrdragndrop" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=92d5d5d8e51c0c2f4f6db4a084a59173" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a1d98e7268455ffeb218786128e982dd" PYPI_PACKAGE = "XStatic-Angular-lrdragndrop" -SRC_URI[md5sum] = "afd682cab9f436cf22b025dfcabaa225" -SRC_URI[sha256sum] = "1cf04495981db5dfd5536441e17ec69bb18d624f847ddc203f3259d81b10a77e" +SRC_URI[md5sum] = "6c6c7969bfa89701db2b316162b36291" +SRC_URI[sha256sum] = "5d3cce15a6342814811ddc372c6035bf4026253664c0b72a660b481cb183ae1b" inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular-mock_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-mock_1.2.1.1.bb index 727d5b07..0de6fba4 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular-mock_1.2.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-mock_1.2.1.1.bb @@ -11,12 +11,12 @@ SRC_URI[sha256sum] = "ffee6edfab8276abd8057ddc28c4d8503424c0c61938e787720766862e inherit setuptools3 pypi -# DEPENDS_default: python-pip +# DEPENDS_default: python3-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb index eae97b28..e74accaf 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular-schema-form_0.8.13.0.bb @@ -1,2 +1,22 @@ -require python-xstatic-angular-schema-form.inc -inherit setuptools3 +DESCRIPTION = "Angular Schema Form packaged for setuptools (easy_install) / pip." +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Angular-Schema-Form" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0e4430cb0dfdb98d3008c66d8339f31a" + +PYPI_PACKAGE = "XStatic-Angular-Schema-Form" + +SRC_URI[md5sum] = "d0faab81c36f4cfc03e092fedc30018d" +SRC_URI[sha256sum] = "7c08634901751267fe26d266fc027cf6ed2e5f422696985cec750594b3f4e300" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-angular_1.5.8.0.bb index 8671b8b7..426e7763 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-angular_1.5.8.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-angular_1.5.8.0.bb @@ -14,9 +14,9 @@ inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.3.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.3.1.0.bb deleted file mode 100644 index 9e9db897..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.3.1.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-bootstrap-datepicker.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.4.0.0.bb index 49885393..3b0a4050 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-datepicker.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-datepicker_1.4.0.0.bb @@ -2,18 +2,18 @@ DESCRIPTION = "Bootstrap-Datepicker JavaScript library packaged for setuptools ( HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Bootstrap-Datepicker" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=97d9c60d3a8c5fccccb317f944688479" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=717661446a83183e303f3f8e0a1ea277" PYPI_PACKAGE = "XStatic-Bootstrap-Datepicker" -SRC_URI[md5sum] = "c2f5c58a7b41162923eca5a36b29b8b2" -SRC_URI[sha256sum] = "9edc9b77501001fcee9fbf4bf0a722c263efd928ef928b40081a8269fdd9a944" +SRC_URI[md5sum] = "68375e81274159874ab5fd6d85ea405c" +SRC_URI[sha256sum] = "df33add9f5e785fa884ac4b182601af6aac9e1eeef7cfe62dbbcb0654d0f2d6e" -inherit pypi +inherit setuptools3 pypi DEPENDS += " \ ${PYTHON_PN}-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.3.7.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.3.7.1.bb deleted file mode 100644 index 20eab88c..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.3.7.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-bootstrap-scss.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb index 29879192..3c21c791 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-bootstrap-scss.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb @@ -1,15 +1,15 @@ DESCRIPTION = "%DESCRIPTION%" HOMEPAGE = "%URL%" SECTION = "devel/python" -LICENSE = "Apache-2" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PYPI_PACKAGE = "XStatic-Bootstrap-SCSS" -SRC_URI[md5sum] = "cc0d26647d10e1de84ba6649d3264f77" -SRC_URI[sha256sum] = "4d388df037293163bf3242e0b60c79d06e1f743af8b0be8473f92676340e5acd" +SRC_URI[md5sum] = "01b41f33c6c57d1a5d59f41ce360bdd0" +SRC_URI[sha256sum] = "5cb56f0090cb6489d643730de57c68d8a6714f2b9fe526ac89bb68f5d77dfe10" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -17,6 +17,6 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb index 5a7d5f8f..b14a11bf 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootswatch_3.3.7.0.bb @@ -1,2 +1,19 @@ -require python-xstatic-bootswatch.inc -inherit setuptools3 +DESCRIPTION = "bootswatch javascript library packaged for setuptools (easy_install) / pip." +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-bootswatch" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +PYPI_PACKAGE = "XStatic-bootswatch" + +SRC_URI[md5sum] = "422f09e076ff1741b76a9f7554ceca32" +SRC_URI[sha256sum] = "93ee5863c1ec07212fe12ae137a10708b4102720391d460f061dd3f441ba3b6e" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb index 242175f1..93b4c1f5 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-d3_3.5.17.0.bb @@ -1,2 +1,22 @@ -require python-xstatic-d3.inc -inherit setuptools3 +DESCRIPTION = "D3 JavaScript library packaged for setuptools" +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-D3" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +PYPI_PACKAGE = "XStatic-D3" + +SRC_URI[md5sum] = "2729f32f218b122999c26daeaf67a0a8" +SRC_URI[sha256sum] = "176e93eee7192e07fc54334ddb1a6b64fcfc8cde6abb23f65727856bb9dd1829" + +inherit setuptools3 pypi + +# DEPENDS_default: python-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb deleted file mode 100644 index b2998f6e..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-font-awesome.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.2.bb deleted file mode 100644 index bdd3c27c..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-hogan.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-hogan.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.3.bb index deeeae10..19d8f7dd 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-hogan.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-hogan_2.0.0.3.bb @@ -2,14 +2,14 @@ DESCRIPTION = "Hogan JavaScript library packaged for setuptools" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Hogan" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=18dc983faa3113478ed59ae157a985d5" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e5366bec2bd8e901c248ef0df2425a7f" PYPI_PACKAGE = "XStatic-Hogan" -SRC_URI[md5sum] = "1c1de09c4813e8568aab98fa5270d6a0" -SRC_URI[sha256sum] = "5941bc7fb2a09916b8837848e6fc2a13b2dfc271811e9b522c61e1337d5fc2bd" +SRC_URI[md5sum] = "b9b7610ba5c16e9ba398efb83d26a656" +SRC_URI[sha256sum] = "27a921963e470abbada15b2d85d198833795aaead5fd73339bc2883cfddb5619" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -17,6 +17,6 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.1.bb deleted file mode 100644 index 86eb7e27..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-jasmine.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jasmine.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.2.bb index cdfb2232..3eebc5ac 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jasmine.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jasmine_2.4.1.2.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PYPI_PACKAGE = "XStatic-Jasmine" -SRC_URI[md5sum] = "9378ce965dfcb4ddb64855cc717d4ec8" -SRC_URI[sha256sum] = "d1e8bf3c0e1cf683cc2c0aad95f197e9e51ea747fb91291445223a2b7dbc4740" +SRC_URI[md5sum] = "736937d16fd655d1f6f2096b97d8255b" +SRC_URI[sha256sum] = "bf921be423c254a5cebc2156a7fd66d8210cefd251fc2fa51f792a153bf9e82b" -inherit pypi +inherit setuptools3 pypi # DEPENDS_default: python-pip @@ -17,6 +17,6 @@ DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.1.bb deleted file mode 100644 index 2dab32f9..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-jquery-migrate.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb new file mode 100644 index 00000000..d63aede5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-migrate_1.2.1.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "JQuery-Migrate JavaScript library packaged for setuptools" +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery-Migrate" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=55fddf010d3daf1956396fa50e27c864" + +PYPI_PACKAGE = "XStatic-JQuery-Migrate" + +SRC_URI[md5sum] = "7ade6ebf832a62e45b0096a1799a1bfc" +SRC_URI[sha256sum] = "db9d28cb161626f979f7999f158a4a7aaf6dc957fd0106b1ad1051d47969c425" + +inherit setuptools3 pypi + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb new file mode 100644 index 00000000..6c45bc3e --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "%DESCRIPTION%" +HOMEPAGE = "%URL%" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7de5500e6244db6d698bbb724aea9a17" + +PYPI_PACKAGE = "XStatic-jquery-ui" + +SRC_URI[md5sum] = "2d5569524c7936d82f41d833f3c84e62" +SRC_URI[sha256sum] = "d6ba48bb474420a8bcb2be02eef6ae96281ec24eff6befa54f04ebc9e4cc8910" + +inherit setuptools3 pypi + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + python3-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb new file mode 100644 index 00000000..87209842 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.quicksearch_2.0.3.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "JQuery.quicksearch JavaScript library packaged for setuptools3 " +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery.quicksearch" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=060aa7a2790c1c3eebeae9236bf16799" + +PYPI_PACKAGE = "XStatic-JQuery.quicksearch" + +SRC_URI[md5sum] = "ac6148cfff5a7a90240e7801bf9f0e4a" +SRC_URI[sha256sum] = "f38760fe93b504f2855ef25e9bf91df65c8a6601674165e4685fb217bb616fd1" + +inherit setuptools3 pypi + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + python3-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb new file mode 100644 index 00000000..314ff371 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery.tablesorter_2.14.5.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "JQuery.TableSorter JavaScript library packaged for setuptools3" +HOMEPAGE = "https://pypi.python.org/pypi/XStatic-JQuery.TableSorter" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e9d3f27b721fc196b019f8afb6f639a0" + +PYPI_PACKAGE = "XStatic-JQuery.TableSorter" + +SRC_URI[md5sum] = "024a8dd83aa173ec0b161e76391ba56c" +SRC_URI[sha256sum] = "bdd847ca0cde4014fd21134f99e59a99ef488185c745e82646911d2f9de3d762" + +inherit setuptools3 pypi + +# DEPENDS_default: python3-pip + +DEPENDS += " \ + python3-pip \ + " + +# RDEPENDS:default: +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_1.10.2.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_1.10.2.1.bb deleted file mode 100644 index efbb9e37..00000000 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_1.10.2.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-xstatic-jquery.inc -inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.inc b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_3.4.1.0.bb index db8e2a24..788a33ac 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jquery.inc +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery_3.4.1.0.bb @@ -6,17 +6,17 @@ LIC_FILES_CHKSUM = "file://README.txt;md5=af1f21066b501c7d9265fab0d5556ece" PYPI_PACKAGE = "XStatic-jQuery" -SRC_URI[md5sum] = "7a29efeab6961ef00ea2272c923f4503" -SRC_URI[sha256sum] = "83416a6bb86e8534858c4d1ddca45e881c87639da6f78000c28c3a193fe91305" +SRC_URI[md5sum] = "8b7ace314d6780e159b2c03cd93a4b5b" +SRC_URI[sha256sum] = "3fccac7eb265f95430c62eb652cdaeb671785267c77413df926d9facd5825978" -inherit pypi +inherit setuptools3 pypi -# DEPENDS_default: python-pip +# DEPENDS_default: python3-pip DEPENDS += " \ ${PYTHON_PN}-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jsencrypt_2.3.1.1.bb index 5c21816e..d544dcb6 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-jsencrypt_2.3.1.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jsencrypt_2.3.1.1.bb @@ -14,9 +14,9 @@ inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-magic-search_0.2.5.2.bb index 06a5ffc7..3e1fbe5a 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-magic-search_0.2.5.1.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-magic-search_0.2.5.2.bb @@ -2,17 +2,17 @@ DESCRIPTION = "An AngularJS directive that provides a UI for both faceted filter HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Magic-Search" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e3d8469611ec04e52d71f2e293d54e9c" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=ed1f7d184ee839074df6b44c744de2c0" PYPI_PACKAGE = "XStatic-Magic-Search" -SRC_URI[md5sum] = "cfb8a82129fffbe1f5c6339240cb6139" -SRC_URI[sha256sum] = "9b2f35a5792f4e763e6dc319036e3676f3e18f46153096f3ab5e507177ec007e" +SRC_URI[md5sum] = "7edce59ce76a326b618f74f797498451" +SRC_URI[sha256sum] = "e72fcf08e7806b60cb6b120fb712c8d221f3ba53c12a10995da01e16fa5360f5" inherit setuptools3 pypi DEPENDS += " \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-mdi_1.4.57.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-mdi_1.6.50.2.bb index 9ea14733..2a1c20b3 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-mdi_1.4.57.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-mdi_1.6.50.2.bb @@ -2,18 +2,18 @@ DESCRIPTION = "mdi javascript library packaged for setuptools3 (easy_install) / HOMEPAGE = "https://pypi.python.org/pypi/XStatic-mdi" SECTION = "devel/python" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=898ae9ca7b59edc4521f10be07c6b622" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=af9320964a0ddf3bd33eccd79c29f964" PYPI_PACKAGE = "XStatic-mdi" -SRC_URI[md5sum] = "f3d3d58603178e5898ee1ea4737826ee" -SRC_URI[sha256sum] = "19b4d522f8fa62fee2893b39147fcf45ebaba8b95d63f3708ebdf34e130a8a53" +SRC_URI[md5sum] = "aa720e603fce607681cc69989fbd41a9" +SRC_URI[sha256sum] = "be1005af7a593b0b3a349aadb05e4160ea65894248a47b246c6658345e2f10c1" inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-objectpath_1.2.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-objectpath_1.2.1.0.bb index bd2eefac..0bb771cb 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-objectpath_1.2.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-objectpath_1.2.1.0.bb @@ -14,9 +14,9 @@ inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-qunit_1.14.0.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-qunit_1.14.0.2.bb index 014b004f..f054aec9 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-qunit_1.14.0.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-qunit_1.14.0.2.bb @@ -14,9 +14,9 @@ inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-rickshaw_1.5.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-rickshaw_1.5.1.0.bb index f3698bff..da94066c 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-rickshaw_1.5.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-rickshaw_1.5.1.0.bb @@ -2,21 +2,21 @@ DESCRIPTION = "Rickshaw JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Rickshaw" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=af85a1450add1a38e6ff5ca1384cc1b6" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=0048c87aa2dfc6c21a4516c06867ad67" PYPI_PACKAGE = "XStatic-Rickshaw" -SRC_URI[md5sum] = "789fffdced10e93e10f75ce1ade6fc6c" -SRC_URI[sha256sum] = "147574228757254442700a9eea5150f14acb1224ef0612f896b663ab58406de8" +SRC_URI[md5sum] = "aef17022c8a0ea3d9e2da6237d5175ef" +SRC_URI[sha256sum] = "cf278d4bd4e974ddcf7170d20bbb706cc34f93cf61658f2f68f3138374178564" inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb index e05e35ed..352ed5eb 100644 --- a/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-roboto-fontface_0.5.0.0.bb @@ -1,2 +1,19 @@ -require python-xstatic-roboto-fontface.inc -inherit setuptools3 +DESCRIPTION = "A simple package providing the Roboto fontface." +HOMEPAGE = "https://github.com/choffmeister/roboto-fontface-bower" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +PYPI_PACKAGE = "XStatic-roboto-fontface" + +SRC_URI[md5sum] = "32273ba68fa063623461db0b0767524f" +SRC_URI[sha256sum] = "6d272df58e20eec3a15bca279163f38614c7074e2fecb537a58b29d109e83f62" + +inherit setuptools3 pypi + +DEPENDS += " \ + ${PYTHON_PN}-pip \ + " + +RDEPENDS:${PN} += " \ + " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-smart-table_1.4.13.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-smart-table_1.4.13.2.bb index 2430c8e3..9e76a268 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-smart-table_1.4.13.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-smart-table_1.4.13.2.bb @@ -12,8 +12,8 @@ SRC_URI[sha256sum] = "f2fa5ed37c2953253de79c61c346fa6c3c4f38731295d2240552c14298 inherit setuptools3 pypi DEPENDS += " \ - python-pip \ + python3-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-spin_1.2.5.2.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-spin_1.2.5.3.bb index 4060bd96..30b0a86a 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-spin_1.2.5.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-spin_1.2.5.3.bb @@ -2,21 +2,21 @@ DESCRIPTION = "Spin JavaScript library packaged for setuptools3" HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Spin" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=322c2399a1682aaec2f4e5fff4be5726" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=45c30e2aa7df682a626f8e3629b8f7ee" PYPI_PACKAGE = "XStatic-Spin" -SRC_URI[md5sum] = "df83f80fd0b11545b64497112996e49e" -SRC_URI[sha256sum] = "7f46ef0e45e047019ba6eda22c432fb96f681b97bbe7f1749aa9209e07727192" +SRC_URI[md5sum] = "d0cad2593c74eec38dbeed5161eab462" +SRC_URI[sha256sum] = "06e889cf3318f08ce74ef888b45d9f1e09017bb8e6d519a299c10a9e6b542642" inherit setuptools3 pypi # DEPENDS_default: python-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-term.js_0.0.7.0.bb index 724fbda4..32c4bb09 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-term.js_0.0.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-term.js_0.0.7.0.bb @@ -15,5 +15,5 @@ DEPENDS += " \ python3-pip \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python-xstatic-tv4_1.2.7.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-tv4_1.2.7.0.bb index e1cdbbe2..3e48b25b 100644 --- a/meta-openstack/recipes-devtools/python/python-xstatic-tv4_1.2.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-xstatic-tv4_1.2.7.0.bb @@ -11,12 +11,12 @@ SRC_URI[sha256sum] = "9b4c57244e914126cdda5d8bc24698189d73800203c85b1fc945a08e25 inherit setuptools3 pypi -# DEPENDS_default: python-pip +# DEPENDS_default: python3-pip DEPENDS += " \ - python-pip \ + python3-pip \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " diff --git a/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb b/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb new file mode 100644 index 00000000..a2ad034a --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-zake_0.2.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "A python package that works to provide a nice set of testing utilities for the kazoo library." +HOMEPAGE = "https://github.com/yahoo/Zake" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=14e79e6983dbd678bbe0ff17229d8fc1" + +SRC_URI[md5sum] = "076dcb58f5cb8b50f575fc0ca7e810b9" +SRC_URI[sha256sum] = "5a50859931c4f666d318b74d1c407a6150dd5194e4c5812d071a5c7c7cefe4e6" + +inherit setuptools3 pypi + +DEPENDS += " \ + python3-pip \ + " + +RDEPENDS:${PN} += " \ + python3-kazoo \ + " diff --git a/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb b/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb new file mode 100644 index 00000000..55423b75 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Python Zaqar Client" +HOMEPAGE = "https://github.com/openstack/python-zaqarclient" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI[sha256sum] = "c64e74d1f69321cb2f33721974c793cac1172eb8397056dfc39a7eb3d9c036de" + +DEPENDS += " \ + python3-pip \ + python3-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python3-pbr-native \ + " + +RDEPENDS:${PN} +=" \ + python3-pbr \ + python3-requests \ + python3-six \ + python3-stevedore \ + python3-jsonschema \ + python3-oslo.i18n \ + python3-oslo.log \ + python3-oslo.utils \ + python3-keystoneauth1 \ + python3-osc-lib \ + " + +PYPI_PACKAGE = "python-zaqarclient" + +inherit setuptools3 pypi diff --git a/meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend +++ b/meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend diff --git a/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc b/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc index ad1ea259..e982d669 100644 --- a/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc +++ b/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc @@ -2,8 +2,8 @@ PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," PACKAGECONFIG[libseccomp] = "--enable-seccomp,--disable-seccomp,libseccomp,libseccomp" PACKAGECONFIG ?= "fdt virtfs libcap-ng" -PACKAGECONFIG_x86 ?= "fdt spice virtfs libcap-ng" -PACKAGECONFIG_x86-64 ?= "fdt spice virtfs libcap-ng" +PACKAGECONFIG:x86 ?= "fdt spice virtfs libcap-ng" +PACKAGECONFIG:x86-64 ?= "fdt spice virtfs libcap-ng" -PACKAGECONFIG_class-native = "fdt" -PACKAGECONFIG_class-nativesdk = "fdt" +PACKAGECONFIG:class-native = "fdt" +PACKAGECONFIG:class-nativesdk = "fdt" diff --git a/meta-openstack/recipes-devtools/ruby/bundler_git.bb b/meta-openstack/recipes-devtools/ruby/bundler_git.bb index f7617a0c..a4300a27 100644 --- a/meta-openstack/recipes-devtools/ruby/bundler_git.bb +++ b/meta-openstack/recipes-devtools/ruby/bundler_git.bb @@ -25,7 +25,7 @@ SRCREV = "06e3647c117da210ffd15a174624497830addd7b" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/bundler/bundler.git;branch=1-7-stable \ + git://github.com/bundler/bundler.git;branch=1-7-stable;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb index 1ade2658..199fd41e 100644 --- a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb +++ b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb @@ -21,12 +21,12 @@ SRCREV = "28fe2928469885b0138de4d4270c6eccac8ab482" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/chef-zero.git;branch=master \ + git://github.com/opscode/chef-zero.git;branch=master;protocol=https \ " inherit ruby -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ mixlib-log \ json \ hashie \ diff --git a/meta-openstack/recipes-devtools/ruby/coderay_git.bb b/meta-openstack/recipes-devtools/ruby/coderay_git.bb index 32536993..a45942f6 100644 --- a/meta-openstack/recipes-devtools/ruby/coderay_git.bb +++ b/meta-openstack/recipes-devtools/ruby/coderay_git.bb @@ -16,7 +16,7 @@ SRCREV = "a48037b85a12228431b32103786456f36beb355f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/rubychan/coderay.git \ + git://github.com/rubychan/coderay.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.6.bb b/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb index a328203e..e2c99d7d 100644 --- a/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.6.bb +++ b/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb @@ -2,11 +2,17 @@ SUMMARY = "Modern concurrency tools including agents, futures, promises, thread HOMEPAGE = "http://www.concurrent-ruby.com" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fde65ae93d18826f70c6fe125aa04297" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319104fe1435b64fc0a67032db44f02" -SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;tag=v1.1.6\ - file://0001-Removed-check-for-concurrent_ruby.jar.patch" +SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;branch=master \ + file://0001-Removed-check-for-concurrent_ruby.jar.patch \ + " +SRCREV = "52c08fca13cc3811673ea2f6fdb244a0e42e0ebe" S = "${WORKDIR}/git" +do_install:append () { + rmdir --ignore-fail-on-non-empty ${D}${libdir}/ruby/gems/${RUBY_GEM_VERSION}/plugins +} + inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb b/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb index baa63403..10e9a498 100644 --- a/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb +++ b/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb @@ -4,9 +4,12 @@ HOMEPAGE = 'http://coolio.github.com' LICENSE = 'MIT' LIC_FILES_CHKSUM = 'file://LICENSE;md5=a5e7701a63eb0a961f98cd10475129b9' -SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;tag=v1.6.0' +SRCREV = 'd7ab8518c11d8fe1b9a679a1686f01a295690fa9' + +SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;branch=master' S = '${WORKDIR}/git' inherit ruby +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb index 8566fb3b..6f6758c0 100644 --- a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb +++ b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb @@ -20,7 +20,7 @@ SRCREV = "704bc2c0000b5f9bf49d607dcd0d3989b63b2595" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/halostatue/diff-lcs.git \ + git://github.com/halostatue/diff-lcs.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/erubis_git.bb b/meta-openstack/recipes-devtools/ruby/erubis_git.bb index 08e0f281..16fd5429 100644 --- a/meta-openstack/recipes-devtools/ruby/erubis_git.bb +++ b/meta-openstack/recipes-devtools/ruby/erubis_git.bb @@ -16,12 +16,12 @@ SRCREV = "1f0b38d9e66885f8af0244d12d1a6702fc04a8de" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/kwatch/erubis.git \ + git://github.com/kwatch/erubis.git;branch=master;protocol=https \ " inherit ruby -do_patch_append() { +do_patch:append() { bb.build.exec_func('do_fixup_gemspec', d) } diff --git a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb index 768bc218..dc984d3a 100644 --- a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb +++ b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb @@ -3,17 +3,19 @@ HOMEPAGE = "https://www.fluentd.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ffc336af228834e68e0a4d38da165f7" -SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;tag=v${PV}" +SRCREV = "9d113029d4550ce576d8825bfa9612aa3e55bff0" + +SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;branch=master" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "cool.io http-parser.rb msgpack serverengine sigdump strptime tzinfo tzinfo-data yajl-ruby" +RDEPENDS:${PN} = "cool.io http-parser.rb msgpack serverengine sigdump strptime tzinfo tzinfo-data yajl-ruby" inherit ruby -do_install_append() { +do_install:append() { install -d ${D}/etc/fluent/ install ${S}/fluent.conf ${D}/etc/fluent/fluent.conf } -INSANE_SKIP_${PN} = "installed-vs-shipped" +INSANE_SKIP:${PN} = "installed-vs-shipped" diff --git a/meta-openstack/recipes-devtools/ruby/hashie_git.bb b/meta-openstack/recipes-devtools/ruby/hashie_git.bb index f26cadb6..65ccb119 100644 --- a/meta-openstack/recipes-devtools/ruby/hashie_git.bb +++ b/meta-openstack/recipes-devtools/ruby/hashie_git.bb @@ -16,7 +16,7 @@ SRCREV = "02df8918dd07ef2da1aceba5fd17e8757027345a" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/intridea/hashie.git \ + git://github.com/intridea/hashie.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/highline_git.bb b/meta-openstack/recipes-devtools/ruby/highline_git.bb index 3bfcd882..546bfc9e 100644 --- a/meta-openstack/recipes-devtools/ruby/highline_git.bb +++ b/meta-openstack/recipes-devtools/ruby/highline_git.bb @@ -10,7 +10,7 @@ rules and without needing to convert the typed Strings into what your \ program really needs. Just tell HighLine what you're after, and let it \ do all the work." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=884766faee6a0d2931af978757e1a5fc" PR = "r0" @@ -22,7 +22,7 @@ SRCREV = "327051c1c217df2880c3a53f31484f7e815e847f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/JEG2/highline.git \ + git://github.com/JEG2/highline.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb index db52ebd5..5452c126 100644 --- a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb +++ b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb @@ -4,7 +4,9 @@ HOMEPAGE = "https://rubygems.org/gems/http_parser.rb" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=157efc3766c6d07d3d857ebbab43351a" -SRC_URI = "git://github.com/tmm1/http_parser.rb.git;protocol=https;tag=v0.6.0" +SRCREV = "c8dae7c6c2c78a5016d082a7fbda7e362292c14a" + +SRC_URI = "gitsm://github.com/tmm1/http_parser.rb.git;protocol=https;branch=master" S = "${WORKDIR}/git" @@ -16,7 +18,9 @@ DEPENDS = "git" inherit ruby # Download the submodules -do_configure_prepend() { +do_configure:prepend() { cd ${WORKDIR}/git git submodule update --init --recursive } + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb b/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb index 116bcf5f..29a89336 100644 --- a/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb +++ b/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb @@ -20,7 +20,7 @@ SRCREV = "96aaf68210d644157bd57a6ec3e38c49f38bfc34" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/bluemonk/ipaddress.git \ + git://github.com/ipaddress-gem/ipaddress.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb index a417798b..61655e5a 100644 --- a/meta-openstack/recipes-devtools/ruby/json_git.bb +++ b/meta-openstack/recipes-devtools/ruby/json_git.bb @@ -4,19 +4,19 @@ SUMMARY = "An implementation of the JSON specification according to RFC 4627" DESCRIPTION = "An implementation of the JSON specification according to RFC 4627" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=aef161fe3c86f1a8d6c71d3b8c5655c5" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://CHANGES;md5=af8cad0ff27a1593ac5ee461bc2d71ab" PR = "r0" -BPV = "1.8.3" +BPV = "1.8.5" PV = "${BPV}" -SRCREV = "db4c71a7701b95c30f945ee1536240920dcfdc17" +SRCREV = "4cf6c6270f52888997ec1b626b9f557db4f26f2e" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/flori/json.git \ + git://github.com/flori/json.git;branch=v1.8;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/method-source_git.bb b/meta-openstack/recipes-devtools/ruby/method-source_git.bb index 39b24d1c..6756f998 100644 --- a/meta-openstack/recipes-devtools/ruby/method-source_git.bb +++ b/meta-openstack/recipes-devtools/ruby/method-source_git.bb @@ -16,7 +16,7 @@ SRCREV = "1b1f8323a7c25f29331fe32511f50697e5405dbd" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/banister/method_source.git \ + git://github.com/banister/method_source.git;branch=master;protocol=https \ file://gemspec-bump-version.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb index 4216db17..989cb626 100644 --- a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb @@ -19,7 +19,7 @@ SRCREV = "bc15d62118b59aabbc9cb6e5734b65bf3bc273f0" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/halostatue/mime-types.git \ + git://github.com/halostatue/mime-types.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb index b380e011..d10835d9 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb @@ -17,12 +17,12 @@ SRCREV = "db24a56c6f5b99114998a50942220a7023060229" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-authentication.git \ + git://github.com/opscode/mixlib-authentication.git;branch=master;protocol=https \ " inherit ruby -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ mixlib-log \ " diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb index 02bf49ca..44309c46 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb @@ -17,7 +17,7 @@ SRCREV = "b3b3c12141b5380ec61945770690fc1ae31d92b0" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-cli.git \ + git://github.com/opscode/mixlib-cli.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb index f58c15c2..68eb393e 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb @@ -17,7 +17,7 @@ SRCREV = "d7bdd7c999e13a0bd67607011731a536323dd51c" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-config.git \ + git://github.com/opscode/mixlib-config.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb index cef61cb0..52a95d6e 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb @@ -17,7 +17,7 @@ SRCREV = "b750625a79cc46fffe6b886320f96e7874497fa0" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-log.git \ + git://github.com/opscode/mixlib-log.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb index 9abe92c8..70e316e5 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb @@ -20,7 +20,7 @@ SRCREV = "27ba1e882dcab280527aa1764d1b45aca3ef5961" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-shellout.git \ + git://github.com/opscode/mixlib-shellout.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb b/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb index 063a8521..53826767 100644 --- a/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb +++ b/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb @@ -4,9 +4,12 @@ HOMEPAGE = "http://msgpack.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;tag=v${PV}" +SRCREV = "64db1bac56359c9257d22f3ffb7506b578d76741" + +SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb index b823a033..160237c3 100644 --- a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb +++ b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb @@ -20,13 +20,13 @@ SRCREV = "1de7611a7f7cedbe7a4c6cf3798c88d00637582d" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/net-ssh/net-ssh-gateway.git \ + git://github.com/net-ssh/net-ssh-gateway.git;branch=master;protocol=https \ file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \ " inherit ruby -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ net-ssh \ " diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb index 7da05668..d95042e5 100644 --- a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb +++ b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb @@ -20,13 +20,13 @@ SRCREV = "5b668d5ef34102c9ac159a8f21c889fdc7f99f1b" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/net-ssh/net-ssh-multi.git \ + git://github.com/net-ssh/net-ssh-multi.git;branch=master;protocol=https \ file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \ " inherit ruby -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ net-ssh \ net-ssh-gateway \ " diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb index f2591ffa..344b34bb 100644 --- a/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb +++ b/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb @@ -18,7 +18,7 @@ SRCREV = "9f8607984d8e904f211cc5edb39ab2a2ca94008e" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/net-ssh/net-ssh.git \ + git://github.com/net-ssh/net-ssh.git;branch=master;protocol=https \ file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/ohai_git.bb b/meta-openstack/recipes-devtools/ruby/ohai_git.bb index 5820c44d..f7bad071 100644 --- a/meta-openstack/recipes-devtools/ruby/ohai_git.bb +++ b/meta-openstack/recipes-devtools/ruby/ohai_git.bb @@ -20,12 +20,12 @@ SRCREV = "5c166cf3fa4b2af541ee54855aae73c809044b3d" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/ohai.git \ + git://github.com/opscode/ohai.git;branch=master;protocol=https \ " inherit ruby -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ mime-types \ ipaddress \ mixlib-cli \ diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb index a4eb63cd..d2c33256 100644 --- a/meta-openstack/recipes-devtools/ruby/pry_git.bb +++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb @@ -18,7 +18,7 @@ SRCREV = "191dc519813402acd6db0d7f73e652ed61f8111f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/pry/pry.git \ + git://github.com/pry/pry.git;branch=master;protocol=https \ file://rdoc-fixup-opt.banner-heredoc.patch \ " @@ -26,7 +26,7 @@ inherit ruby RUBY_COMPILE_FLAGS = "" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ coderay \ method-source \ slop \ diff --git a/meta-openstack/recipes-devtools/ruby/rack_git.bb b/meta-openstack/recipes-devtools/ruby/rack_git.bb index 41f01c54..2c03cff3 100644 --- a/meta-openstack/recipes-devtools/ruby/rack_git.bb +++ b/meta-openstack/recipes-devtools/ruby/rack_git.bb @@ -20,7 +20,7 @@ SRCREV = "134d6218d0881d87ae6a522e88eafbddb6cd1bb7" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/rack/rack.git;branch=1-6-stable \ + git://github.com/rack/rack.git;branch=1-6-stable;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb index 923e9f26..706af39c 100644 --- a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb +++ b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb @@ -18,12 +18,12 @@ SRCREV = "40eddc184a7b3fe79f9b68f291e06df4c1fbcb0b" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/rest-client/rest-client.git \ + git://github.com/rest-client/rest-client.git;branch=master;protocol=https \ " inherit ruby -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ mime-types \ " diff --git a/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb b/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb index 1ed8f9e9..553c5673 100644 --- a/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb +++ b/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb @@ -4,10 +4,14 @@ HOMEPAGE = 'https://rubygems.org/gems/serverengine' LICENSE = 'Apache-2.0' LIC_FILES_CHKSUM = 'file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57' -SRC_URI = 'git://github.com/treasure-data/serverengine.git;protocol=https;tag=v2.2.1' +SRCREV = '99d44a0989ab3e64e14ac0367aadf76aa13b3583' + +SRC_URI = 'git://github.com/treasure-data/serverengine.git;protocol=https;branch=master' S = '${WORKDIR}/git' -RDEPENDS_${PN} = "sigdump" +RDEPENDS:${PN} = "sigdump" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb index fbf651eb..fc5152e8 100644 --- a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb +++ b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://github.com/frsyuki/sigdump" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=07d6218b18fb6826f04fd32b4918f085" -SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;tag=v0.2.4" +SRCREV = "57570f04456560512e4efc1c6fa695b76c17dc0d" + +SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/slop_git.bb b/meta-openstack/recipes-devtools/ruby/slop_git.bb index 043284cd..14debbf2 100644 --- a/meta-openstack/recipes-devtools/ruby/slop_git.bb +++ b/meta-openstack/recipes-devtools/ruby/slop_git.bb @@ -16,7 +16,7 @@ SRCREV = "50c4d5a6553c9d0b78dee35a092ea3a40c136fa1" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/leejarvis/slop.git \ + git://github.com/leejarvis/slop.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb index 20a1f5bc..d568272d 100644 --- a/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb +++ b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb @@ -4,10 +4,14 @@ HOMEPAGE = "https://github.com/nurse/strptime" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f19575067ffc5f1ddc02c74eeef9904f" -SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;tag=v0.2.3" +SRCREV = "1583aaa510cae4660907b22c8262ab31b1eb1864" + +SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;branch=master" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/systemu_git.bb b/meta-openstack/recipes-devtools/ruby/systemu_git.bb index 606103e3..fa407f1d 100644 --- a/meta-openstack/recipes-devtools/ruby/systemu_git.bb +++ b/meta-openstack/recipes-devtools/ruby/systemu_git.bb @@ -17,7 +17,7 @@ SRCREV = "cb253a8bf213beea69f27418202e936a22d7308f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/ahoward/systemu.git \ + git://github.com/ahoward/systemu.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb index 5fb6005d..46407553 100644 --- a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb +++ b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://tzinfo.github.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c326926e773a4e99e89820f5d8a0966f" -SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;tag=v1.2019.3" +SRCREV = "74d5a2529d585e1d1ab47b6bbb2449cba29f6907" + +SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb index 2ea1f2d3..504e3a89 100644 --- a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb +++ b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb @@ -4,10 +4,14 @@ HOMEPAGE = "https://tzinfo.github.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c326926e773a4e99e89820f5d8a0966f" -SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;tag=v2.0.1" +SRCREV = "16b0ff837923401da52325312c51baf9bec700e1" + +SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;branch=master" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "concurrent-ruby" +RDEPENDS:${PN} = "concurrent-ruby" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb index 43934763..f91d414a 100644 --- a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb +++ b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb @@ -4,8 +4,12 @@ HOMEPAGE = "http://rdoc.info/projects/brianmario/yajl-ruby" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7dbd3a9f471247a243db5b62fe091587" -SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;tag=1.4.0" +SRCREV = "8830754ac1ca04a0c14f71f6e7c1d240934366fe" + +SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/yard_git.bb b/meta-openstack/recipes-devtools/ruby/yard_git.bb index d5232016..2728802e 100644 --- a/meta-openstack/recipes-devtools/ruby/yard_git.bb +++ b/meta-openstack/recipes-devtools/ruby/yard_git.bb @@ -20,7 +20,7 @@ SRCREV = "d83194e1a09098ec5be28b616cde3b9a15380873" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/lsegal/yard.git \ + git://github.com/lsegal/yard.git;branch=main;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch b/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch deleted file mode 100644 index 869fb311..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 72dd3b4b38705442d821fe97a40061f23e748769 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Thu, 6 Mar 2014 01:55:09 -0500 -Subject: [PATCH] cloud-init: source local lsb functions - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - sysvinit/debian/cloud-config | 1 + - sysvinit/debian/cloud-final | 1 + - sysvinit/debian/cloud-init | 1 + - sysvinit/debian/cloud-init-local | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/sysvinit/debian/cloud-config b/sysvinit/debian/cloud-config -index 53322748ac65..7874dcfab9b0 100644 ---- a/sysvinit/debian/cloud-config -+++ b/sysvinit/debian/cloud-config -@@ -30,6 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-final b/sysvinit/debian/cloud-final -index 55afc8b0678a..661314f0b64c 100644 ---- a/sysvinit/debian/cloud-final -+++ b/sysvinit/debian/cloud-final -@@ -32,6 +32,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-init b/sysvinit/debian/cloud-init -index 48fa04233f00..d3ccec99bacc 100755 ---- a/sysvinit/debian/cloud-init -+++ b/sysvinit/debian/cloud-init -@@ -30,6 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-init-local b/sysvinit/debian/cloud-init-local -index 802ee8e9f386..c309e8347324 100644 ---- a/sysvinit/debian/cloud-init-local -+++ b/sysvinit/debian/cloud-init-local -@@ -29,6 +29,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in --- -1.7.10.4 - diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg b/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg deleted file mode 100644 index f8689363..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg +++ /dev/null @@ -1,99 +0,0 @@ -# The top level settings are used as module -# and system configuration. - -# A set of users which may be applied and/or used by various modules -# when a 'default' entry is found it will reference the 'default_user' -# from the distro configuration specified below -users: - - default - -# If this is set, 'root' will not be able to ssh in and they -# will get a message to login instead as the above $user (ubuntu) -disable_root: False - -# This will cause the set+update hostname module to not operate (if true) -preserve_hostname: false -manage_etc_hosts: %MANAGE_HOSTS% - -datasource_list: - - None - -# Example datasource config -# datasource: -# Ec2: -# metadata_urls: [ 'blah.com' ] -# timeout: 5 # (defaults to 50 seconds) -# max_wait: 10 # (defaults to 120 seconds) - -# The modules that run in the 'init' stage -cloud_init_modules: - - migrator - - seed_random - - bootcmd - - write-files - - growpart - - set_hostname - - update_hostname - - update_etc_hosts - - ca-certs - - rsyslog - - users-groups - - ssh - -# The modules that run in the 'config' stage -cloud_config_modules: -# Emit the cloud config ready event -# this can be used by upstart jobs for 'start on cloud-config'. - - emit_upstart - - disk_setup - - mounts - - ssh-import-id - - locale - - set-passwords - - grub-dpkg - - apt-pipelining - - apt-configure - - package-update-upgrade-install - - landscape - - timezone - - puppet - - chef - - salt-minion - - mcollective - - disable-ec2-metadata - - runcmd - - byobu - -# The modules that run in the 'final' stage -cloud_final_modules: - - rightscale_userdata - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - keys-to-console - - phone-home - - final-message - - power-state-change - -# set the hostname -hostname: %HOSTNAME% - -# System and/or distro specific settings -# (not accessible to handlers/transforms) -system_info: - # This will affect which distro class gets used - distro: windriver - # Default user name + that default users groups (if added/used) - default_user: - name: root - lock_passwd: False - groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video] - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash - # Other config here will be given to the distro class and/or path classes - paths: - cloud_dir: /var/lib/cloud/ - templates_dir: /etc/cloud/templates/ - ssh_svcname: ssh diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch b/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch deleted file mode 100644 index f52faf39..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6ad7caf6410237f3b1bed6ff4d9f0423e69afcd6 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Mon, 10 Mar 2014 00:57:18 -0400 -Subject: [PATCH] distros: add windriver skeleton distro file - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - cloudinit/distros/windriver.py | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 cloudinit/distros/windriver.py - -diff --git a/cloudinit/distros/windriver.py b/cloudinit/distros/windriver.py -new file mode 100644 -index 000000000000..8eec13fe2207 ---- /dev/null -+++ b/cloudinit/distros/windriver.py -@@ -0,0 +1,24 @@ -+# vi: ts=4 expandtab -+# -+# Copyright (C) 2014 WindRiver -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License version 3, as -+# published by the Free Software Foundation. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+ -+from cloudinit.distros import debian -+from cloudinit import log as logging -+ -+LOG = logging.getLogger(__name__) -+ -+ -+class Distro(debian.Distro): -+ pass --- -1.7.10.4 - diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb deleted file mode 100644 index 8bbbef1e..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Init scripts for use on cloud images" -HOMEPAGE = "https://launchpad.net/cloud-init" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -PR = "r0" - -SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ - file://cloud-init-source-local-lsb-functions.patch \ - file://distros-add-windriver-skeleton-distro-file.patch \ - file://cloud.cfg" - -SRC_URI[md5sum] = "cd392e943dd0165e90a6d56afd0e4ad3" -SRC_URI[sha256sum] = "9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7" - -S = "${WORKDIR}/${BPN}-${PV}" - -DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" -DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" - -MANAGE_HOSTS ?= "False" -HOSTNAME ?= "" - -do_install_prepend() { - sed -e 's:/lib/${BPN}:${base_libdir}/${BPN}:' -i ${S}/setup.py -} - -do_install_append() { - install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg - - sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - - ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init - ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints -} - -inherit setuptools3 update-rc.d - -PACKAGES += "${PN}-systemd" - -FILES_${PN} += "${sysconfdir}/* \ - ${datadir}/*" - -FILES_${PN}-systemd += "${systemd_unitdir}/*" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${BPN} = "cloud-init" - -RDEPENDS_${PN} = "sysklogd \ - python3 \ - " diff --git a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb index cb58e9df..23e326bb 100644 --- a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb +++ b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb @@ -2,7 +2,7 @@ SUMMARY = "An image containing the cirros cloud guest" DESCRIPTION = "CirrOS a tiny cloud guest" HOMEPAGE = "https://launchpad.net/cirros" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" SRC_URI = "http://download.cirros-cloud.net/${PV}/${PN}-${PV}-x86_64-disk.img" @@ -19,4 +19,4 @@ do_install() { } PACKAGES = "cirros-guest-image" -FILES_cirros-guest-image = "${ROOT_HOME}/images/*" +FILES:cirros-guest-image = "${ROOT_HOME}/images/*" diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb index 2fbb85e2..f01d0ed5 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb @@ -27,7 +27,7 @@ inherit identity inherit monitor # check for 5G of free space, so we use 5G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" +IMAGE_ROOTFS_EXTRA_SPACE += "+ 5000000" POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup" diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb index 897efc42..a725e2e9 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb @@ -19,6 +19,6 @@ inherit monitor # Ensure extra space for guest images, and rabbit MQ has a hard coded # check for 2G of free space, so we use 3G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000" # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb index 6f324d84..96dc80c4 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb @@ -24,5 +24,5 @@ inherit monitor # Ensure extra space for guest images, and rabbit MQ has a hard coded # check for 2G of free space, so we use 5G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 5000000" diff --git a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc index 2a53557a..b26605d7 100644 --- a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc +++ b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc @@ -1,3 +1,3 @@ -RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ +RRECOMMENDS:${PN} += "kernel-module-xt-conntrack \ kernel-module-xt-redirect \ " diff --git a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc index ec858a7f..6ebb4a33 100644 --- a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc +++ b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://common-account" SRC_URI += "file://common-auth" @@ -9,7 +9,7 @@ SRC_URI += "file://common-session-noninteractive" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then install -m 755 -d ${D}/etc/pam.d/ install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend +++ b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc index 0b0f0114..7d8a4603 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc +++ b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc @@ -5,9 +5,9 @@ PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ inherit useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN}_append = " ;--system libvirt" +GROUPADD_PARAM:${PN}:append = " ;--system libvirt" -do_install_append() { +do_install:append() { sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf } diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc index 33b1f61c..73cc86a8 100644 --- a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc +++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd } diff --git a/meta-openstack/recipes-extended/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb index ee20e3b9..82dcd4b3 100644 --- a/meta-openstack/recipes-extended/novnc/novnc_git.bb +++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb @@ -1,52 +1,33 @@ DESCRIPTION = "HTML5 VNC client" HOMEPAGE = "https://github.com/kanaka/noVNC" SECTION = "web" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b428e7772bf00c07fb7b863b80358adf" -PR = "r0" +SRCREV = "9142f8f0f7b4a53447f5cfec3a797cbf0d6204a9" +PV = "1.2.0+git${SRCPV}" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ac06308a999996ffc2d24d81b3a39f1b" - -SRCREV = "8f12ca7a5a64144fe548cada332d5d19ef26a1fe" -PV = "0.4+git${SRCPV}" - -SRC_URI = "git://github.com/kanaka/noVNC.git" +SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https" S = "${WORKDIR}/git" -RDEPENDS_${PN} += "python-numpy" -RDEPENDS_${PN} += "python-novnc" -RDEPENDS_${PN} += "python-websockify" - do_compile() { : } +RDEPENDS:${PN} += " \ + bash \ +" + do_install() { - install -m 755 -d ${D}${bindir}/novnc - install -m 755 -d ${D}${datadir}/novnc/include - - install -m 644 ${S}/vnc.html ${D}${datadir}/novnc - install -m 644 ${S}/vnc_auto.html ${D}${datadir}/novnc - install -m 644 ${S}/images/favicon.ico ${D}${datadir}/novnc - install -m 644 ${S}/include/base64.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/des.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/display.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/input.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/logo.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/base.css ${D}${datadir}/novnc/include - install -m 644 ${S}/include/blue.css ${D}${datadir}/novnc/include - install -m 644 ${S}/include/black.css ${D}${datadir}/novnc/include - install -m 644 ${S}/include/playback.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/rfb.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/ui.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/util.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/websock.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/webutil.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/jsunzip.js ${D}${datadir}/novnc/include - - sed -i -e 's:#!/usr/bin/env bash:#!/bin/sh:' ${S}/utils/launch.sh - - install -m 755 ${S}/utils/launch.sh ${D}${bindir}/novnc-launch.sh + install -m 755 -d ${D}${datadir}/novnc + + cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/novnc + + install -m 444 ${S}/vnc.html ${D}${datadir}/novnc/index.html + install -m 444 ${S}/vnc_lite.html ${D}${datadir}/novnc/vnc_auto.html + + install -m 755 -d ${D}${bindir} + install ${S}/utils/launch.sh ${D}${bindir}/novnc_server } diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb index e659c317..40172ca8 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ tempest \ rally-api \ rally-setup \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index e884af06..0f009e6c 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ cloud-init \ postgresql \ qemu \ @@ -28,7 +28,7 @@ RDEPENDS_${PN} = " \ ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ kernel-module-kvm \ kernel-module-kvm-intel \ kernel-module-kvm-amd \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index 80947688..851e3fa4 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " postgresql \ +RDEPENDS:${PN} = " postgresql \ postgresql-client \ python-psycopg2 \ rabbitmq-server \ @@ -55,7 +55,7 @@ RDEPENDS_${PN} = " postgresql \ ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ kernel-module-fuse \ cloud-init \ kernel-module-softdog \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb index fecbdc62..4806b2b6 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-core-tools-debug \ " diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb index 9273916c..0d561e01 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ vim \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \ " diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb index 749a99fb..17d662cc 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ neutron-plugin-openvswitch \ neutron-dhcp-agent \ neutron-l3-agent \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb index 4bf657b2..6c703709 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Dummy packagegroup to provide virtual/monitoring" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" inherit packagegroup @@ -13,8 +13,8 @@ PACKAGES = "\ ${SRCNAME}-agent \ " -RDEPENDS_${SRCNAME}-core += "\ +RDEPENDS:${SRCNAME}-core += "\ " -RDEPENDS_${SRCNAME}-agent += "\ +RDEPENDS:${SRCNAME}-agent += "\ " diff --git a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb index 9db46859..3a486b4f 100644 --- a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb +++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb @@ -12,4 +12,5 @@ SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c S = "${WORKDIR}/qpid-${PV}/python" -inherit distutils3 +inherit setuptools3 + diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb index 933f5efd..9d8bfc68 100644 --- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb +++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7ab4c208aa62d92d7a03cc8e0a89c12b" SECTION = "mq" DEPENDS = "boost perl-native python3 util-linux cyrus-sasl" -RDEPENDS_${PN} = "cyrus-sasl-bin" +RDEPENDS:${PN} = "cyrus-sasl-bin" PR = "r0" SRC_URI = "http://archive.apache.org/dist/${PN}/${PV}/qpid-cpp-0.20.tar.gz \ @@ -32,28 +32,28 @@ EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function \ pythondir=${PYTHON_SITEPACKAGES_DIR} \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/qpidd ${D}${sysconfdir}/init.d/qpidd } PACKAGES += "qmfgen qmfgen-python qmfgen-python-dbg" -FILES_qmfgen = "${bindir}/qmf-gen" +FILES:qmfgen = "${bindir}/qmf-gen" -FILES_qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*" +FILES:qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*" -FILES_${PN} += "${libdir}/${PN}/tests/test_store.so" +FILES:${PN} += "${libdir}/${PN}/tests/test_store.so" -FILES_${PN}-dev += "${libdir}/${PN}/tests/test_store.so " +FILES:${PN}-dev += "${libdir}/${PN}/tests/test_store.so " -FILES_${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \ +FILES:${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \ ${libdir}/${PN}/tests/.debug/* \ ${libdir}/${PN}/daemon/.debug/*" -FILES_${PN}-doc += "${datadir}/qpidc/*" +FILES:${PN}-doc += "${datadir}/qpidc/*" INITSCRIPT_NAME = "qpidd" INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb index 7f003fd6..7816003c 100644 --- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb +++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb @@ -26,7 +26,7 @@ DEPENDS = " \ coreutils-native\ " -RDEPENDS_${PN} = "erlang erlang-modules" +RDEPENDS:${PN} = "erlang erlang-modules" do_compile() { oe_runmake @@ -68,18 +68,18 @@ do_install() { inherit useradd update-rc.d systemd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system rabbitmq" -USERADD_PARAM_${PN} = "--system --create-home --home /var/lib/rabbitmq \ +GROUPADD_PARAM:${PN} = "--system rabbitmq" +USERADD_PARAM:${PN} = "--system --create-home --home /var/lib/rabbitmq \ -g rabbitmq rabbitmq" INITSCRIPT_NAME = "rabbitmq-server" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "rabbitmq-server.service" +SYSTEMD_SERVICE:${PN} = "rabbitmq-server.service" -FILES_${PN} += " ${libdir}/rabbitmq/lib/${PN}-${PV}/* \ +FILES:${PN} += " ${libdir}/rabbitmq/lib/${PN}-${PV}/* \ ${localstatedir}/* \ " -FILES_${PN}-doc += "LICENSE* INSTALL" -INSANE_SKIP_${PN} = "unsafe-references-in-scripts" +FILES:${PN}-doc += "LICENSE* INSTALL" +INSANE_SKIP:${PN} = "unsafe-references-in-scripts" diff --git a/meta-openstack/recipes-extended/syslog/syslog-user.inc b/meta-openstack/recipes-extended/syslog/syslog-user.inc index 57aba008..5c28ce40 100644 --- a/meta-openstack/recipes-extended/syslog/syslog-user.inc +++ b/meta-openstack/recipes-extended/syslog/syslog-user.inc @@ -5,6 +5,6 @@ inherit useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system syslog" -USERADD_PARAM_${PN} = "--system --home /var/log -g syslog syslog" +GROUPADD_PARAM:${PN} = "--system syslog" +USERADD_PARAM:${PN} = "--system --home /var/log -g syslog syslog" diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb index 48a286ce..4854516c 100644 --- a/meta-openstack/recipes-extended/tempest/tempest_git.bb +++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb @@ -9,7 +9,7 @@ SRCNAME = "tempest" inherit setuptools3 identity hosts -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://tempest.conf \ file://logging.conf \ " @@ -61,7 +61,7 @@ python () { d.setVarFlags("USERCREATE_PARAM_%s-setup-admin" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/ TEMPEST_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -106,18 +106,18 @@ PACKAGES =+ "${SRCNAME}-tests \ ${SRCNAME}-setup-admin \ " -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*" +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*" -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ ${sysconfdir}/* \ ${bindir}/* \ " -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-setup-altdemo = "1" -ALLOW_EMPTY_${SRCNAME}-setup-admin = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-setup-altdemo = "1" +ALLOW_EMPTY:${SRCNAME}-setup-admin = "1" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${SRCNAME}-tests \ ${SRCNAME}-setup \ ${SRCNAME}-setup-altdemo \ diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb index bf6b30f2..62e0df42 100644 --- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb +++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=33ab1ce13e2312dddfad07f97f66321f" SRCNAME = "uwsgi" -SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0 \ +SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0;protocol=https \ file://Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ file://more-Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ " @@ -26,8 +26,8 @@ DEPENDS += " \ yajl \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc b/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc index cc774fed..4faab108 100644 --- a/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc +++ b/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto:" SRC_URI += "file://enable-veth.cfg \ file://enable-iscsi-tcp.cfg \ diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb index 86e4165a..8a881523 100644 --- a/meta-openstack/recipes-support/chef/chef_git.bb +++ b/meta-openstack/recipes-support/chef/chef_git.bb @@ -18,7 +18,7 @@ SRCREV = "1dc20627aa5d742376269dc5b4d5c67f34d08008" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/chef.git;branch=12.4-stable \ + git://github.com/opscode/chef.git;branch=12.4-stable;protocol=https \ file://0001-chang-ksh-to-sh.patch \ " @@ -31,7 +31,7 @@ DEPENDS += " \ bundler-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ chef-zero \ coderay \ @@ -64,9 +64,9 @@ RDEPENDS_${PN} += " \ RUBY_INSTALL_GEMS = "pkg/chef-${BPV}.gem" -FILES_${PN} += "${libdir}/ruby/gems/2.2.0/build_info" -FILES_${PN} += "${libdir}/ruby/gems/2.2.0/extensions" +FILES:${PN} += "${libdir}/ruby/gems/2.2.0/build_info" +FILES:${PN} += "${libdir}/ruby/gems/2.2.0/extensions" -do_install_prepend() { +do_install:prepend() { rake gem } diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc b/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc index 0c979fea..d731da26 100644 --- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc +++ b/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run } diff --git a/meta-openstack/recipes-support/ebtables/ebtables_2.0.10-4.bbappend b/meta-openstack/recipes-support/ebtables/ebtables_2.%.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-support/ebtables/ebtables_2.0.10-4.bbappend +++ b/meta-openstack/recipes-support/ebtables/ebtables_2.%.%.bbappend diff --git a/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc b/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc index 9f6f2e63..83aff01b 100644 --- a/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc +++ b/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc @@ -1,4 +1,4 @@ -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ kernel-module-ebtables \ kernel-module-ebtable-nat \ kernel-module-ebt-arp \ diff --git a/meta-openstack/recipes-support/iproute2/iproute2_5.%.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_6.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_5.%.bbappend +++ b/meta-openstack/recipes-support/iproute2/iproute2_6.%.bbappend diff --git a/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc b/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc index 2fde00dc..f0302b0d 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc +++ b/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}" -RRECOMMENDS_${PN} += "kernel-module-veth \ +RRECOMMENDS:${PN} += "kernel-module-veth \ " diff --git a/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb b/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb index b2d776b1..bc8ae256 100644 --- a/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb +++ b/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" inherit autotools systemd DEPENDS += "libevent" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ bash \ perl \ perl-module-posix \ @@ -51,9 +51,9 @@ INITSCRIPT_NAME = "memcached" INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "memcached" -SYSTEMD_SERVICE_${PN} = "memcached.service" +SYSTEMD_SERVICE:${PN} = "memcached.service" -do_install_append() { +do_install:append() { install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached mkdir -p ${D}/usr/share/memcached/scripts diff --git a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch index 4683db0a..79aedffd 100644 --- a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch +++ b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch @@ -7,28 +7,31 @@ This allows the recipe to specify specific values instead of them being 'discovered' which may lead to host contamination or similar issues. +Updated for 4.9.0: Jeremy Puhlman + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- +---- configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) + diff --git a/configure.ac b/configure.ac -index 25afe44..b5a9e03 100644 +index 37a0f86..9b77c7f 100644 --- a/configure.ac +++ b/configure.ac -@@ -100,26 +100,38 @@ fi +@@ -106,26 +106,38 @@ fi AC_SUBST(PYTHON) +if test -z "${PYTHON_VERSION}"; then PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("VERSION"))'` +fi +if test -z "${PYTHON_LDVERSION}"; then PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'` +fi @@ -38,7 +41,7 @@ index 25afe44..b5a9e03 100644 +if test -z "${PYTHON_INCLUDEPY}"; then CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'` +else +CPPFLAGS1="${PYTHON_INCLUDEPY}" @@ -46,7 +49,7 @@ index 25afe44..b5a9e03 100644 +if test -z "${PYTHON_CFLAGS}"; then CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \ sysconfig.get_config_var("CFLAGS").split())))'` +else @@ -55,13 +58,13 @@ index 25afe44..b5a9e03 100644 if test "${ENABLE_EMBEDDED}" != "yes"; then CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED" -@@ -131,22 +143,43 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}" +@@ -137,22 +149,42 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}" AC_SUBST(CPPFLAGS) +if test -z "${PYTHON_LIBDIR}"; then PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("LIBDIR"))'` +else +PYTHONLIBDIR="${PYTHON_LIBDIR}" @@ -76,22 +79,21 @@ index 25afe44..b5a9e03 100644 +fi +if test -z "${PYTHON_FRAMEWORKDIR}"; then PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'` +else +PYTHONFRAMEWORKDIR="${PYTHON_FRAMEWORKDIR}" +fi -+ +if test -z "${PYTHON_FRAMEWORKPREFIX}"; then PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'` +else +PYTHONFRAMEWORKPREFIX="${PYTHON_FRAMEWORKPREFIX}" +fi +if test -z "${PYTHON_FRAMEWORK}"; then PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` +else +PYTHONFRAMEWORK="${PYTHON_FRAMEWORK}" @@ -99,20 +101,20 @@ index 25afe44..b5a9e03 100644 if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" -@@ -170,12 +203,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ +@@ -180,12 +212,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ LDLIBS1="-lpython${PYTHON_VERSION}" fi + if test -z "${PYTHON_LIBS}"; then LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("LIBS"))'` + else + LDLIBS2="${PYTHON_LIBS}" + fi + if test -z "${PYTHON_SYSLIBS}"; then LDLIBS3=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("SYSLIBS"))'` + else + LDLIBS3="${PYTHON_SYSLIBS}" @@ -120,6 +122,3 @@ index 25afe44..b5a9e03 100644 else LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}" --- -2.7.4 - diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb index 73dab13a..b0daf54d 100644 --- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb +++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb @@ -9,21 +9,21 @@ HOMEPAGE = "https://github.com/GrahamDumpleton/mod_wsgi" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "217e80b7436035723b80ff02ee349365e8553dfc" -PV = "4.6.8+git${SRCPV}" +SRCREV = "df9faf954a1ab6208f45ba6fde90f0b41f605483" +PV = "4.9.0+git${SRCPV}" S = "${WORKDIR}/git" SRCNAME = "mod_wsgi" SRC_URI = "\ - git://github.com/GrahamDumpleton/mod_wsgi.git \ + git://github.com/GrahamDumpleton/mod_wsgi.git;branch=master;protocol=https \ file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \ " -inherit autotools-brokensep distutils3-base +inherit autotools-brokensep setuptools3-base DEPENDS += "apache2-native apache2 python3" -RDEPENDS_${PN} = "python3" +RDEPENDS:${PN} = "python3" EXTRA_OECONF = "\ --with-apxs=${STAGING_BINDIR_CROSS}/apxs \ @@ -42,10 +42,10 @@ EXTRA_OECONF = "\ CFLAGS += " -I${STAGING_INCDIR}/apache2" -FILES_${PN} += "/etc/apache2/" -FILES_${PN}-dbg += "${libdir}/apache2/modules/.debug" +FILES:${PN} += "/etc/apache2/" +FILES:${PN}-dbg += "${libdir}/apache2/modules/.debug" -do_install_append() { +do_install:append() { mkdir -p ${D}/etc/apache2/modules.d/ echo "LoadModule wsgi_module ${libexecdir}/apache2/modules/mod_wsgi.so" > \ ${D}/etc/apache2/modules.d/wsgi.load diff --git a/meta-openstack/recipes-support/openldap/openldap_openstack.inc b/meta-openstack/recipes-support/openldap/openldap_openstack.inc index 63f6064f..603dc3f9 100644 --- a/meta-openstack/recipes-support/openldap/openldap_openstack.inc +++ b/meta-openstack/recipes-support/openldap/openldap_openstack.inc @@ -1,7 +1,7 @@ DEPEND_${PN} += "cyrus-sasl" RDEPEND_${PN} += "libsasl2-modules" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://initscript" SRC_URI += "file://ops-base.ldif" @@ -12,7 +12,7 @@ OPENLDAP_LIBEXECDIR = "${libexecdir}" EXTRA_OECONF += "--libexecdir=${OPENLDAP_LIBEXECDIR}" -do_install_append() { +do_install:append() { install -D -m 0755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/openldap sed -i -e 's/%DEFAULT_DN%/${LDAP_DN}/g' ${D}${sysconfdir}/init.d/openldap sed -i -e 's#%LDAP_DATADIR%#${LDAP_DATADIR}#g' ${D}${sysconfdir}/init.d/openldap @@ -69,5 +69,5 @@ inherit update-rc.d INITSCRIPT_NAME = "openldap" INITSCRIPT_PARAMS = "defaults" -FILES_${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif" -FILES_${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug" +FILES:${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif" +FILES:${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug" diff --git a/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch b/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch deleted file mode 100644 index 76d6f412..00000000 --- a/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch +++ /dev/null @@ -1,158 +0,0 @@ -Upstream-Status: Pending - -# The Salt SysV scripts require that the process name of the salt -# components have the form "salt-<component>". -# The current python shebangs on the salt components scripts spwans -# processes that are generically named python. Changed shebang so -# process names will be identifiable by the init scripts. - -diff --git a/scripts/salt b/scripts/salt -index 1a6d6b4d0c..0408ad07b2 100755 ---- a/scripts/salt -+++ b/scripts/salt -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - ''' -diff --git a/scripts/salt-api b/scripts/salt-api -index 6f028bacb6..7a51117822 100755 ---- a/scripts/salt-api -+++ b/scripts/salt-api -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Import salt libs - from salt.scripts import salt_api -diff --git a/scripts/salt-call b/scripts/salt-call -index 5b8a8f3935..9ddda9428d 100755 ---- a/scripts/salt-call -+++ b/scripts/salt-call -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Directly call a salt command in the modules, does not require a running salt - minion to run. -diff --git a/scripts/salt-cloud b/scripts/salt-cloud -index e977b68179..01c593881c 100755 ---- a/scripts/salt-cloud -+++ b/scripts/salt-cloud -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - ''' -diff --git a/scripts/salt-cp b/scripts/salt-cp -index 3da660d137..dcc3f11554 100755 ---- a/scripts/salt-cp -+++ b/scripts/salt-cp -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - ''' -diff --git a/scripts/salt-extend b/scripts/salt-extend -index 5385a7b6a9..b01c584bb4 100755 ---- a/scripts/salt-extend -+++ b/scripts/salt-extend -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Quickstart for creating an/or extending the functionality of your SaltStack installation - -diff --git a/scripts/salt-key b/scripts/salt-key -index cb26dfd5a6..596b202a3f 100755 ---- a/scripts/salt-key -+++ b/scripts/salt-key -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Manage the authentication keys with salt-key - ''' -diff --git a/scripts/salt-master b/scripts/salt-master -index b4323bd532..52bb47dc47 100755 ---- a/scripts/salt-master -+++ b/scripts/salt-master -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Start the salt-master - ''' -diff --git a/scripts/salt-minion b/scripts/salt-minion -index 74a9fa1d67..4a23ed9122 100755 ---- a/scripts/salt-minion -+++ b/scripts/salt-minion -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - This script is used to kick off a salt minion daemon - ''' -diff --git a/scripts/salt-proxy b/scripts/salt-proxy -index e921e6590b..443774ef85 100755 ---- a/scripts/salt-proxy -+++ b/scripts/salt-proxy -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - ''' - This script is used to kick off a salt proxy minion daemon -diff --git a/scripts/salt-run b/scripts/salt-run -index 2b2d86554c..cfef160ab0 100755 ---- a/scripts/salt-run -+++ b/scripts/salt-run -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Execute a salt convenience routine - ''' -diff --git a/scripts/salt-ssh b/scripts/salt-ssh -index 4f21baa5f4..77bb6ceb38 100755 ---- a/scripts/salt-ssh -+++ b/scripts/salt-ssh -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Execute the salt ssh system - ''' -diff --git a/scripts/salt-syndic b/scripts/salt-syndic -index d6faf2df63..896bf5f3b0 100755 ---- a/scripts/salt-syndic -+++ b/scripts/salt-syndic -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - This script is used to kick off a salt syndic daemon - ''' -diff --git a/scripts/salt-unity b/scripts/salt-unity -index b0a2d31597..ff1fa9034c 100755 ---- a/scripts/salt-unity -+++ b/scripts/salt-unity -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from salt.scripts import salt_unity - -diff --git a/scripts/spm b/scripts/spm -index 027864ee11..4d9b648b5d 100755 ---- a/scripts/spm -+++ b/scripts/spm -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - diff --git a/meta-openstack/recipes-support/salt/salt_3000.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb index c2bc8da0..4a77fb81 100644 --- a/meta-openstack/recipes-support/salt/salt_3000.bb +++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb @@ -1,7 +1,7 @@ HOMEPAGE = "http://saltstack.com/" SECTION = "admin" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac9a49d86925151327b277d6a3999a07" DEPENDS = "\ python3-msgpack \ python3-pyyaml \ @@ -18,17 +18,16 @@ PACKAGECONFIG ??= "zeromq" PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto," PACKAGECONFIG[tcp] = ",,python3-pycrypto" -SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ - file://set_python_location_hashbang.patch \ +SRC_URI = "https://files.pythonhosted.org/packages/source/s/${BPN}/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "8084ef6f2a275b627ae364b9d562b4ff" -SRC_URI[sha256sum] = "04fbc64933b375cbbefc9576bcc65167b74d5eec7f58e64d096d67529ea66500" +SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9" +SRC_URI[sha256sum] = "e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc" -SYSTEMD_AUTO_ENABLE_${PN}-master = "disable" -SYSTEMD_AUTO_ENABLE_${PN}-minion = "disable" -SYSTEMD_AUTO_ENABLE_${PN}-api = "disable" +SYSTEMD_AUTO_ENABLE:${PN}-master = "disable" +SYSTEMD_AUTO_ENABLE:${PN}-minion = "disable" +SYSTEMD_AUTO_ENABLE:${PN}-api = "disable" S = "${WORKDIR}/${PN}-${PV}" @@ -36,9 +35,9 @@ inherit setuptools3 systemd # Avoid a QA Warning triggered by the test package including a file # with a .a extension -INSANE_SKIP_${PN}-tests += "staticdev" +INSANE_SKIP:${PN}-tests += "staticdev" -RDEPENDS_${PN} += "${PN}-api \ +RDEPENDS:${PN} += "${PN}-api \ ${PN}-common \ ${PN}-master \ ${PN}-minion \ @@ -59,7 +58,7 @@ PACKAGES += "\ ${PN}-zsh-completion \ " -do_install_append() { +do_install:append() { install -Dm644 ${S}/pkg/salt-common.logrotate ${D}${sysconfdir}/logrotate.d/${PN} install -Dm644 ${S}/pkg/salt.bash ${D}${datadir}/bash-completion/completions/${PN} install -Dm644 ${S}/pkg/zsh_completion.zsh ${D}${datadir}/zsh/site-functions/_${PN} @@ -74,9 +73,9 @@ do_install_append() { done } -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "" -FILES_${PN} += "${systemd_system_unitdir} ${systemd_system_unitdir}/* /etc/salt/master.d /etc/salt/master.d/preseed_key.py" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} = "" +FILES:${PN} += "${systemd_system_unitdir} ${systemd_system_unitdir}/* /etc/salt/master.d /etc/salt/master.d/preseed_key.py" DESCRIPTION_COMMON = "salt is a powerful remote execution manager that can be used to administer servers in a\ fast and efficient way. It allows commands to be executed across large groups of servers. This means systems\ @@ -86,74 +85,74 @@ DESCRIPTION_COMMON = "salt is a powerful remote execution manager that can be us Between the remote execution system, and state management Salt addresses the backbone of cloud and data center\ management." -SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system" -DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." -RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" -RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" -RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" -RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode" -RSUGGESTS_${PN}-minion = "python3-augeas" -CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion" -FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy ${systemd_system_unitdir}/salt-minion.service" - -SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" -DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ +SUMMARY:${PN}-minion = "client package for salt, the distributed remote execution system" +DESCRIPTION:${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt." +RDEPENDS:${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)" +RDEPENDS:${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" +RDEPENDS:${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" +RRECOMMENDS:${PN}-minion:append_x64 = "dmidecode" +RSUGGESTS:${PN}-minion = "python3-augeas" +CONFFILES:${PN}-minion = "${sysconfdir}/${PN}/minion" +FILES:${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy ${systemd_system_unitdir}/salt-minion.service" + +SUMMARY:${PN}-common = "shared libraries that salt requires for all packages" +DESCRIPTION:${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ salt-master, salt-minion, and salt-syndic require to function." -RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0)" -RRECOMMENDS_${PN}-common = "lsb" -RSUGGESTS_${PN}-common = "python3-mako python3-git" -RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" -CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" -FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python3.7/ ${CONFFILES_${PN}-common}" - -SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" -DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ +RDEPENDS:${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro" +RRECOMMENDS:${PN}-common = "lsb-release" +RSUGGESTS:${PN}-common = "python3-mako python3-git" +RCONFLICTS:${PN}-common = "python3-mako (< 0.7.0)" +CONFFILES:${PN}-common="${sysconfdir}/logrotate.d/${PN}" +FILES:${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}" + +SUMMARY:${PN}-ssh = "remote manager to administer servers via salt" +DESCRIPTION:${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ to be installed on the remote host." -RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" -CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster" -FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" +RDEPENDS:${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" +CONFFILES:${PN}-ssh="${sysconfdir}/${PN}/roster" +FILES:${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" -SUMMARY_${PN}-api = "generic, modular network access system" -DESCRIPTION_${PN}-api = "a modular interface on top of Salt that can provide a variety of entry points into a \ +SUMMARY:${PN}-api = "generic, modular network access system" +DESCRIPTION:${PN}-api = "a modular interface on top of Salt that can provide a variety of entry points into a \ running Salt system. It can start and manage multiple interfaces allowing a REST API to coexist with XMLRPC or \ even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\ sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\ on Read the Docs: http://salt-api.readthedocs.org/" -RDEPENDS_${PN}-api = "${PN}-master" -RSUGGESTS_${PN}-api = "python3-cherrypy" -CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api" -FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service" +RDEPENDS:${PN}-api = "${PN}-master" +RSUGGESTS:${PN}-api = "python3-cherrypy" +CONFFILES:${PN}-api = "${sysconfdir}/init.d/${PN}-api" +FILES:${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service" -SUMMARY_${PN}-master = "remote manager to administer servers via salt" -DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." -RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" -RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" -RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" -CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" -RSUGGESTS_${PN}-master = "python3-git" -FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service" +SUMMARY:${PN}-master = "remote manager to administer servers via salt" +DESCRIPTION:${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." +RDEPENDS:${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)" +RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" +RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" +CONFFILES:${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" +RSUGGESTS:${PN}-master = "python3-git" +FILES:${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service" -SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" -DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ +SUMMARY:${PN}-syndic = "master-of-masters for salt, the distributed remote execution system" +DESCRIPTION:${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ salt; it enables the management of multiple masters at a time." -RDEPENDS_${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})" -CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" -FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic} ${systemd_system_unitdir}/${PN}-syndic.service" - -SUMMARY_${PN}-cloud = "public cloud VM management system" -DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." -RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})" -RSUGGESTS_${PN}-cloud = "python3-netaddr python3-botocore" -CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud" -FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" - -SUMMARY_${PN}-tests = "salt stack test suite" -DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." -RDEPENDS_${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash" -FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" - -FILES_${PN}-bash-completion = "${datadir}/bash-completion" -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" +RDEPENDS:${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})" +CONFFILES:${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" +FILES:${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic} ${systemd_system_unitdir}/${PN}-syndic.service" + +SUMMARY:${PN}-cloud = "public cloud VM management system" +DESCRIPTION:${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system." +RDEPENDS:${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})" +RSUGGESTS:${PN}-cloud = "python3-netaddr python3-botocore" +CONFFILES:${PN}-cloud = "${sysconfdir}/${PN}/cloud" +FILES:${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" + +SUMMARY:${PN}-tests = "salt stack test suite" +DESCRIPTION:${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." +RDEPENDS:${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash" +FILES:${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" + +FILES:${PN}-bash-completion = "${datadir}/bash-completion" +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" diff --git a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb index b488130c..b69b08c0 100644 --- a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb +++ b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb @@ -11,7 +11,7 @@ DESCRIPTION = "\ where it is running, but from anywhere on the Internet and from a wide \ variety of machine architectures. \ " -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = "\ file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" @@ -19,11 +19,11 @@ LIC_FILES_CHKSUM = "\ # Version is based on checkout 0.1.4" PV = "0.1.4" SRCREV = "19ade3cf38cc5f5b61fd038f5ce5f4cdb080e9ca" -SRC_URI = "git://anongit.freedesktop.org/spice/spice-html5" +SRC_URI = "git://anongit.freedesktop.org/spice/spice-html5;branch=master" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "python-websockify" +RDEPENDS:${PN} = "python-websockify" do_install() { oe_runmake DESTDIR="${D}" datadir="${D}/${datadir}" install diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb index 5242dd50..9c5c24bf 100644 --- a/meta-openstack/recipes-support/tgt/tgt_git.bb +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Linux SCSI target framework (tgt)" HOMEPAGE = "http://stgt.sourceforge.net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" DEPENDS = "sg3-utils libaio" SRCREV = "b43dbc6711e43c0a32cc4d9df22884841d911d51" PV = "1.0.79+git${SRCPV}" -SRC_URI = "git://github.com/fujita/tgt.git \ +SRC_URI = "git://github.com/fujita/tgt.git;branch=master;protocol=https \ file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ file://0001-usr-Makefile-WARNING-fix.patch \ file://usr-Makefile-apply-LDFLAGS-to-all-executables.patch \ @@ -19,12 +19,12 @@ SRC_URI += "file://tgtd.init \ S = "${WORKDIR}/git" -CONFFILES_${PN} += "${sysconfdir}/tgt/targets.conf" +CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf" inherit update-rc.d systemd -SYSTEMD_SERVICE_${PN} = "tgtd.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "tgtd.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" CFLAGS += ' -I. -DUSE_SIGNALFD -DUSE_TIMERFD -D_GNU_SOURCE -DTGT_VERSION=\\"1.0.63\\" -DBSDIR=\\"${libdir}/backing-store\\"' @@ -50,11 +50,11 @@ do_install() { fi } -FILES_${PN} += "${systemd_unitdir}/system/tgtd.service \ +FILES:${PN} += "${systemd_unitdir}/system/tgtd.service \ ${sysconfdir}/sysconfig/tgtd \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ bash \ libaio \ libconfig-general-perl \ @@ -88,5 +88,5 @@ RDEPENDS_${PN} = " \ perl-module-constant \ " INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "tgtd" +INITSCRIPT_NAME:${PN} = "tgtd" diff --git a/recipes-connectivity/consul/consul-migrate_git.bb b/recipes-connectivity/consul/consul-migrate_git.bb index 8419cb86..1393c912 100644 --- a/recipes-connectivity/consul/consul-migrate_git.bb +++ b/recipes-connectivity/consul/consul-migrate_git.bb @@ -4,7 +4,7 @@ LICENSE = "BSD & MPL-2.0 & MIT" LIC_FILES_CHKSUM = "file://src/github.com/hashicorp/consul-migrate/LICENSE;md5=b278a92d2c1509760384428817710378" GO_IMPORT = "github.com/hashicorp/consul-migrate" -SRC_URI = "git://${GO_IMPORT}.git" +SRC_URI = "https://${GO_IMPORT}.git;branch=master" SRCREV = "678fb10cdeae25ab309e99e655148f0bf65f9710" S = "${WORKDIR}/git" @@ -18,13 +18,13 @@ SRCREV_bolt = "c6ba97b89e0454fec9aa92e1d33a4e2c5fc1f631" SRCREV_go-msgpack = "fa3f63826f7c23912c15263591e65d54d080b458" SRC_URI += " \ - git://github.com/hashicorp/raft;name=raft;destsuffix=git/src/github.com/hashicorp/raft \ - git://github.com/armon/go-metrics;name=go-metrics;destsuffix=git/src/github.com/armon/go-metrics \ - git://github.com/hashicorp/raft-boltdb;name=raft-boltdb;destsuffix=git/src/github.com/hashicorp/raft-boltdb \ - git://github.com/hashicorp/raft-mdb;name=raft-mdb;destsuffix=git/src/github.com/hashicorp/raft-mdb \ - git://github.com/armon/gomdb;name=gomdb;destsuffix=git/src/github.com/armon/gomdb \ - git://github.com/boltdb/bolt;name=bolt;destsuffix=git/src/github.com/boltdb/bolt \ - git://github.com/hashicorp/go-msgpack;name=go-msgpack;destsuffix=git/src/github.com/hashicorp/go-msgpack \ + https://github.com/hashicorp/raft;name=raft;destsuffix=git/src/github.com/hashicorp/raft;branch=master;protocol=https \ + https://github.com/armon/go-metrics;name=go-metrics;destsuffix=git/src/github.com/armon/go-metrics;branch=master;protocol=https \ + https://github.com/hashicorp/raft-boltdb;name=raft-boltdb;destsuffix=git/src/github.com/hashicorp/raft-boltdb;branch=master;protocol=https \ + https://github.com/hashicorp/raft-mdb;name=raft-mdb;destsuffix=git/src/github.com/hashicorp/raft-mdb;branch=master;protocol=https \ + https://github.com/armon/gomdb;name=gomdb;destsuffix=git/src/github.com/armon/gomdb;branch=master;protocol=https \ + https://github.com/boltdb/bolt;name=bolt;destsuffix=git/src/github.com/boltdb/bolt;branch=master;protocol=https \ + https://github.com/hashicorp/go-msgpack;name=go-msgpack;destsuffix=git/src/github.com/hashicorp/go-msgpack;branch=master;protocol=https \ " inherit go diff --git a/recipes-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb index b96499c4..0d084b0d 100644 --- a/recipes-connectivity/consul/consul_git.bb +++ b/recipes-connectivity/consul/consul_git.bb @@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://src/github.com/hashicorp/consul/LICENSE;md5=b278a92d2 GO_IMPORT = "github.com/hashicorp/consul" SRCREV = "944cc71026c007e7de9467ec3f38f0ad14464fcc" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=main;protocol=https \ file://0001-Migration-Rename-imports-throughout.patch \ file://consul.service \ " S = "${WORKDIR}/git" -RDEPENDS_${PN}-dev_append = " bash" +RDEPENDS:${PN}-dev:append = " bash" # Temporarily workaround an issue with GO 1.12.1 # http://www.lyddzz.com/github_/golang/go/issues/30768 @@ -23,17 +23,21 @@ inherit systemd go # Besides the hosts specified in goarch, we do not build for mips. # -COMPATIBLE_HOST_mipsarch = "null" +COMPATIBLE_HOST:mipsarch = "null" -SYSTEMD_SERVICE_${PN} = "consul.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "consul.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" -do_install_append() { +do_compile:prepend () { + export GO111MODULE=off +} + +do_install:append() { install -d ${D}/${systemd_unitdir}/system cp ${WORKDIR}/consul.service ${D}/${systemd_unitdir}/system } -FILES_${PN} += "${systemd_unitdir}/system" +FILES:${PN} += "${systemd_unitdir}/system" #for i586, executable consul contains textrel -INSANE_SKIP_${PN} += "textrel" +INSANE_SKIP:${PN} += "textrel" diff --git a/recipes-connectivity/dhcp/dhcp_%.bbappend b/recipes-connectivity/dhcp/dhcp_%.bbappend deleted file mode 100644 index 617caccb..00000000 --- a/recipes-connectivity/dhcp/dhcp_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)} diff --git a/recipes-connectivity/dhcp/dhcp_virtualization.inc b/recipes-connectivity/dhcp/dhcp_virtualization.inc deleted file mode 100644 index 7466056c..00000000 --- a/recipes-connectivity/dhcp/dhcp_virtualization.inc +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://dhclient-exit-hooks \ - " - -do_install_append () { - install -m 0644 ${WORKDIR}/dhclient-exit-hooks ${D}${sysconfdir}/dhcp/dhclient-exit-hooks - sed 's%/etc/dhclient-exit-hooks%/etc/dhcp/dhclient-exit-hooks%g' -i ${D}${base_sbindir}/dhclient-script - - sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\n&%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf - sed 's%netbios-name-servers,.*netbios-scope;%netbios-name-servers, netbios-scope, classless-static-routes;\n%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf - -} - -FILES_${PN}-client += "${sysconfdir}/dhcp/dhclient-exit-hooks \ - " diff --git a/recipes-connectivity/dhcp/files/dhclient-exit-hooks b/recipes-connectivity/dhcp/files/dhclient-exit-hooks deleted file mode 100644 index 41bcb084..00000000 --- a/recipes-connectivity/dhcp/files/dhclient-exit-hooks +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash -# -# /etc/dhcp/dhclient-exit-hooks -# -# This file is sourced by /sbin/dhclient-script. -# -# dhcp option 121 is defined in RFC3442. The following is the link. -# http://www.ietf.org/rfc/rfc3442.txt -# -# The code for this option is 121, and its minimum length is 5 bytes. -# This option can contain one or more static routes, each of which -# consists of a destination descriptor and the IP address of the router -# that should be used to reach that destination. -# -# Code Len Destination 1 Router 1 -# +-----+---+----+-----+----+----+----+----+----+ -# | 121 | n | d1 | ... | dN | r1 | r2 | r3 | r4 | -# +-----+---+----+-----+----+----+----+----+----+ -# -# Destination 2 Router 2 -# +----+-----+----+----+----+----+----+ -# | d1 | ... | dN | r1 | r2 | r3 | r4 | -# +----+-----+----+----+----+----+----+ -# -# In the above example, two static routes are specified. -# -# The following table contains some examples of how various subnet -# number/mask combinations can be encoded: -# -# Subnet number Subnet mask Destination descriptor -# 0 0 0 -# 10.0.0.0 255.0.0.0 8.10 -# 10.0.0.0 255.255.255.0 24.10.0.0 -# 10.17.0.0 255.255.0.0 16.10.17 -# 10.27.129.0 255.255.255.0 24.10.27.129 -# 10.229.0.128 255.255.255.128 25.10.229.0.128 -# 10.198.122.47 255.255.255.255 32.10.198.122.47 -# -# For metadata service, the following is a valid route from nova-api that -# the VM instance can uses to retrieve metadata. -# -# 32 169 254 169 254 128 224 149 201 -# -# In the above example, mask length of destination descriptor is always 32, -# destination is always "169.254.169.254", and the gateway is a valid IP address. -# -# The add_routes function takes an array of unsigned integer 8, separated by spaces, -# parse them, and added each of the routes into routing table. -# - -function add_routes() { -while [ $# -ne 0 ]; do - mask=$1 - shift - - # Parse the arguments into a CIDR net/mask string - if [ $mask -eq 32 ]; then - destination="-host $1.$2.$3.$4" - shift; shift; shift; shift - elif [ $mask -gt 24 ]; then - destination="-net $1.$2.$3.$4/$mask" - shift; shift; shift; shift - elif [ $mask -gt 16 ]; then - destination="-net $1.$2.$3.0/$mask" - shift; shift; shift - elif [ $mask -gt 8 ]; then - destination="-net $1.$2.0.0/$mask" - shift; shift - #Add the default route - elif [ $mask -eq 0 ]; then - destination="default" - else - destination="-net $1.0.0.0/$mask" - shift - fi - - # Read the gateway - gateway="$1.$2.$3.$4" - shift; shift; shift; shift - - # Add route into routing table - route add $destination gw $gateway - - # Print it out if the route is added successfully - if [ $? = 0 ]; then - echo "Added route \"$destination gw $gateway\"" - fi -done -} - -# Call add_routes to add routes -if [ "x$new_classless_static_routes" != x ]; then - add_routes $new_classless_static_routes -fi - diff --git a/recipes-connectivity/serf/hashicorp-serf_0.8.5.bb b/recipes-connectivity/serf/hashicorp-serf_0.8.5.bb index 0b1517b1..8318400d 100644 --- a/recipes-connectivity/serf/hashicorp-serf_0.8.5.bb +++ b/recipes-connectivity/serf/hashicorp-serf_0.8.5.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=b278a92d2c15097603844288 require serf-vendor-licenses.inc GO_IMPORT = "github.com/hashicorp/serf" -SRC_URI = "git://${GO_IMPORT}.git;protocol=https" +SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master" PV = "0.8.5+git${SRCPV}" SRCREV = "1d3fdf93bbe5002c5023da50402368a817488691" @@ -26,7 +26,7 @@ S = "${WORKDIR}/git" inherit go -RDEPENDS_${PN}-dev += "bash make" +RDEPENDS:${PN}-dev += "bash make" # Apache serf in oe-core is a completely different beast -RCONFLICTS_${PN} = "serf" +RCONFLICTS:${PN} = "serf" diff --git a/recipes-devtools/python/python-ansible.inc b/recipes-devtools/python/python-ansible.inc index f1b3771a..7c9d0f51 100644 --- a/recipes-devtools/python/python-ansible.inc +++ b/recipes-devtools/python/python-ansible.inc @@ -1,22 +1,20 @@ DESCRIPTION = "Ansible is a simple IT automation platform that makes your applications and systems easier to deploy." HOMEPAGE = "https://github.com/ansible/ansible/" SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRCNAME = "ansible" -SRC_URI = "http://releases.ansible.com/ansible/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "git://github.com/ansible/ansible.git;protocol=https;branch=stable-2.16" -SRC_URI[md5sum] = "b1be8f05864a07c06b8a767dcd48ba1b" -SRC_URI[sha256sum] = "cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5" +SRCREV = "ee04df4796af1a438bc80aff33cdd5ca4d5304aa" - -S = "${WORKDIR}/${SRCNAME}-${PV}" +S = "${WORKDIR}/git" ANSIBLE_WHITELIST_MODULES ?= "commands files system network/ovs __pycache__ service" -do_install_append() { +do_install:append() { set +e # install hosts and conf diff --git a/recipes-devtools/python/python3-ansible-collections_9.4.0.bb b/recipes-devtools/python/python3-ansible-collections_9.4.0.bb new file mode 100644 index 00000000..94f1af05 --- /dev/null +++ b/recipes-devtools/python/python3-ansible-collections_9.4.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Curated set of Ansible collections included in addition to ansible-core" +DESCRIPTION = "Ansible is a radically simple model-driven configuration management, \ +multi-node deployment, and remote task execution system. Ansible works \ +over SSH and does not require any software or daemons to be installed \ +on remote nodes. Extension modules can be written in any language and \ +are transferred to managed machines automatically. \ +This package provides a curated set of Ansible collections included in addition \ +to ansible-core." +HOMEPAGE = "https://pypi.org/project/ansible/" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +PYPI_PACKAGE = "ansible" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "dd431c63380e18c3faca3288ebde8ce2f4f992363ab558a3c11c8f2032d90867" + +RDEPENDS:${PN} = " \ + bash \ + python3-ansible \ +" diff --git a/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch b/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch index e98eb46c..420324b7 100644 --- a/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch +++ b/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch @@ -1,808 +1,557 @@ -From 66b824da2fadfd5760040be244f89fa8320df55b Mon Sep 17 00:00:00 2001 +From f14f3a89262e9348348f6aeced9c20067a613062 Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Thu, 13 Jul 2017 14:11:46 -0400 +Date: Thu, 11 May 2023 17:05:54 +0800 Subject: [PATCH] python3: ensure py scripts use py3 for shebang +Upstream-Status: Pending + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +Rebase to 2.14.5 +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +Rebase to 2.16.5 +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- - bin/ansible | 2 +- - bin/ansible-connection | 2 +- - bin/ansible-console | 2 +- - bin/ansible-doc | 2 +- - bin/ansible-galaxy | 2 +- - bin/ansible-playbook | 2 +- - bin/ansible-pull | 2 +- - bin/ansible-vault | 2 +- - contrib/inventory/abiquo.py | 2 +- - contrib/inventory/apache-libcloud.py | 2 +- - contrib/inventory/apstra_aos.py | 2 +- - contrib/inventory/azure_rm.py | 2 +- - contrib/inventory/brook.py | 2 +- - contrib/inventory/cloudforms.py | 2 +- - contrib/inventory/cloudstack.py | 2 +- - contrib/inventory/cobbler.py | 2 +- - contrib/inventory/collins.py | 2 +- - contrib/inventory/consul_io.py | 2 +- - contrib/inventory/digital_ocean.py | 2 +- - contrib/inventory/docker.py | 2 +- - contrib/inventory/ec2.py | 2 +- - contrib/inventory/fleet.py | 2 +- - contrib/inventory/foreman.py | 2 +- - contrib/inventory/freeipa.py | 2 +- - contrib/inventory/gce.py | 2 +- - contrib/inventory/jail.py | 2 +- - contrib/inventory/landscape.py | 2 +- - contrib/inventory/libvirt_lxc.py | 2 +- - contrib/inventory/linode.py | 2 +- - contrib/inventory/lxc_inventory.py | 2 +- - contrib/inventory/mdt_dynamic_inventory.py | 2 +- - contrib/inventory/nagios_livestatus.py | 2 +- - contrib/inventory/nagios_ndo.py | 2 +- - contrib/inventory/nova.py | 2 +- - contrib/inventory/nsot.py | 2 +- - contrib/inventory/openshift.py | 2 +- - contrib/inventory/openstack.py | 2 +- - contrib/inventory/openvz.py | 2 +- - contrib/inventory/ovirt.py | 2 +- - contrib/inventory/ovirt4.py | 2 +- - contrib/inventory/packet_net.py | 2 +- - contrib/inventory/proxmox.py | 2 +- - contrib/inventory/rackhd.py | 2 +- - contrib/inventory/rax.py | 2 +- - contrib/inventory/rhv.py | 2 +- - contrib/inventory/rudder.py | 2 +- - contrib/inventory/serf.py | 2 +- - contrib/inventory/softlayer.py | 2 +- - contrib/inventory/spacewalk.py | 2 +- - contrib/inventory/ssh_config.py | 2 +- - contrib/inventory/stacki.py | 2 +- - contrib/inventory/vagrant.py | 2 +- - contrib/inventory/vbox.py | 2 +- - contrib/inventory/vmware.py | 2 +- - contrib/inventory/vmware_inventory.py | 2 +- - contrib/inventory/windows_azure.py | 2 +- - contrib/inventory/zabbix.py | 2 +- - contrib/inventory/zone.py | 2 +- - docs/docsite/rst/dev_guide/developing_api.rst | 2 +- - hacking/dump_playbook_attributes.py | 2 +- - hacking/module_formatter.py | 2 +- - lib/ansible/modules/web_infrastructure/django_manage.py | 2 +- - lib/ansible/modules/windows/win_file_version.py | 2 +- - lib/ansible/modules/windows/win_firewall_rule.py | 2 +- - test/compile/compile.py | 2 +- - test/integration/cleanup_rax.py | 2 +- - .../targets/embedded_module/library/test_integration_module | 2 +- - test/integration/targets/module_utils/module_utils/foo.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bam.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bam/bam.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bar/bam.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bar/bar.py | 2 +- - test/integration/targets/service/files/ansible_test_service | 2 +- - test/runner/ansible-test | 2 +- - test/runner/injector/ansible | 2 +- - test/runner/injector/ansible-console | 2 +- - test/runner/injector/ansible-doc | 2 +- - test/runner/injector/ansible-galaxy | 2 +- - test/runner/injector/ansible-playbook | 2 +- - test/runner/injector/ansible-pull | 2 +- - test/runner/injector/ansible-vault | 2 +- - test/runner/injector/cover | 2 +- - test/runner/injector/cover2 | 2 +- - test/runner/injector/cover2.4 | 2 +- - test/runner/injector/cover2.6 | 2 +- - test/runner/injector/cover2.7 | 2 +- - test/runner/injector/cover3 | 2 +- - test/runner/injector/cover3.5 | 2 +- - test/runner/injector/cover3.6 | 2 +- - test/runner/injector/injector.py | 2 +- - test/runner/injector/pytest | 2 +- - test/runner/injector/runner | 2 +- - test/runner/injector/runner2 | 2 +- - test/runner/injector/runner2.4 | 2 +- - test/runner/injector/runner2.6 | 2 +- - test/runner/injector/runner2.7 | 2 +- - test/runner/injector/runner3 | 2 +- - test/runner/injector/runner3.5 | 2 +- - test/runner/injector/runner3.6 | 2 +- - test/runner/retry.py | 2 +- - test/runner/test.py | 2 +- - test/sanity/code-smell/ansible-var-precedence-check.py | 2 +- - test/sanity/code-smell/integration-aliases.py | 2 +- - test/sanity/code-smell/shebang.sh | 4 ++-- - test/sanity/validate-modules/test_validate_modules_regex.py | 2 +- - test/sanity/validate-modules/validate-modules | 2 +- - test/units/executor/module_common/test_module_common.py | 4 ++-- - test/units/modules/network/nxos/test_nxos_config.py | 2 +- - test/utils/shippable/ansible-core-ci | 2 +- - test/utils/shippable/download.py | 2 +- - 121 files changed, 123 insertions(+), 123 deletions(-) + .azure-pipelines/scripts/combine-coverage.py | 2 +- + .azure-pipelines/scripts/publish-codecov.py | 2 +- + .azure-pipelines/scripts/time-command.py | 2 +- + hacking/ansible-profile | 2 +- + hacking/azp/download.py | 2 +- + hacking/azp/get_recent_coverage_runs.py | 2 +- + hacking/azp/incidental.py | 2 +- + hacking/azp/run.py | 2 +- + hacking/backport/backport_of_line_adder.py | 2 +- + hacking/create-bulk-issues.py | 2 +- + hacking/report.py | 2 +- + hacking/return_skeleton_generator.py | 2 +- + hacking/test-module.py | 2 +- + hacking/tests/gen_distribution_version_testcase.py | 2 +- + hacking/update-sanity-requirements.py | 2 +- + lib/ansible/cli/adhoc.py | 2 +- + lib/ansible/cli/config.py | 2 +- + lib/ansible/cli/console.py | 2 +- + lib/ansible/cli/doc.py | 2 +- + lib/ansible/cli/galaxy.py | 2 +- + lib/ansible/cli/inventory.py | 2 +- + lib/ansible/cli/playbook.py | 2 +- + lib/ansible/cli/pull.py | 2 +- + lib/ansible/cli/scripts/ansible_connection_cli_stub.py | 2 +- + lib/ansible/cli/vault.py | 2 +- + packaging/cli-doc/build.py | 2 +- + packaging/release.py | 2 +- + test/integration/targets/ansible-config/files/ini_dupes.py | 2 +- + .../targets/ansible-galaxy-collection/files/build_bad_tar.py | 2 +- + .../targets/ansible-galaxy-role/files/create-role-archive.py | 2 +- + test/integration/targets/ansible-test-container/runme.py | 2 +- + .../targets/ansible-test-integration-targets/test.py | 2 +- + .../ansible_collections/ns/col/run-with-pty.py | 2 +- + .../ns/col/tests/integration/targets/no-tty/assert-no-tty.py | 2 +- + .../ansible_collections/ns/col/scripts/env_python.py | 2 +- + .../ns/col/tests/integration/targets/valid/env_python.py | 2 +- + test/integration/targets/ansible-test/venv-pythons.py | 2 +- + test/integration/targets/ansible-vault/faux-editor.py | 2 +- + test/integration/targets/ansible-vault/password-script.py | 2 +- + test/integration/targets/ansible-vault/test-vault-client.py | 2 +- + .../targets/builtin_vars_prompt/test-vars_prompt.py | 2 +- + test/integration/targets/cli/test-cli.py | 2 +- + test/integration/targets/cli/test_k_and_K.py | 2 +- + test/integration/targets/collection/update-ignore.py | 2 +- + test/integration/targets/debugger/test_run_once.py | 2 +- + test/integration/targets/fork_safe_stdio/run-with-pty.py | 2 +- + test/integration/targets/gathering/uuid.fact | 2 +- + test/integration/targets/gathering_facts/uuid.fact | 2 +- + test/integration/targets/module_utils/module_utils/sub/bam.py | 2 +- + .../targets/module_utils/module_utils/sub/bam/bam.py | 2 +- + test/integration/targets/packaging_cli-doc/verify.py | 2 +- + test/integration/targets/pause/test-pause.py | 2 +- + test/integration/targets/pip/files/setup.py | 2 +- + .../integration/targets/service/files/ansible_test_service.py | 2 +- + .../targets/service_facts/files/ansible_test_service.py | 2 +- + .../targets/template/role_filter/filter_plugins/myplugin.py | 2 +- + test/integration/targets/test_utils/scripts/timeout.py | 2 +- + test/integration/targets/throttle/test_throttle.py | 2 +- + .../targets/var_precedence/ansible-var-precedence-check.py | 2 +- + test/lib/ansible_test/_internal/util_common.py | 2 +- + .../_util/controller/sanity/code-smell/shebang.py | 4 ++-- + .../ansible_test/_util/target/cli/ansible_test_cli_stub.py | 2 +- + test/units/executor/module_common/test_module_common.py | 4 ++-- + 63 files changed, 65 insertions(+), 65 deletions(-) -diff --git a/bin/ansible b/bin/ansible -index 24550b9..0587499 100755 ---- a/bin/ansible -+++ b/bin/ansible -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-connection b/bin/ansible-connection -index 93d787e..f0b9aa3 100755 ---- a/bin/ansible-connection -+++ b/bin/ansible-connection -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # (c) 2016, Ansible, Inc. <support@ansible.com> - # -diff --git a/bin/ansible-console b/bin/ansible-console -index 24550b9..0587499 100755 ---- a/bin/ansible-console -+++ b/bin/ansible-console +diff --git a/.azure-pipelines/scripts/combine-coverage.py b/.azure-pipelines/scripts/combine-coverage.py +index 506ade6460..15bee40234 100755 +--- a/.azure-pipelines/scripts/combine-coverage.py ++++ b/.azure-pipelines/scripts/combine-coverage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-doc b/bin/ansible-doc -index 24550b9..0587499 100755 ---- a/bin/ansible-doc -+++ b/bin/ansible-doc + """ + Combine coverage data from multiple jobs, keeping the data only from the most recent attempt from each job. + Coverage artifacts must be named using the format: "Coverage $(System.JobAttempt) {StableUniqueNameForEachJob}" +diff --git a/.azure-pipelines/scripts/publish-codecov.py b/.azure-pipelines/scripts/publish-codecov.py +index f2bc4b84b3..01ad32f494 100755 +--- a/.azure-pipelines/scripts/publish-codecov.py ++++ b/.azure-pipelines/scripts/publish-codecov.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-galaxy b/bin/ansible-galaxy -index 24550b9..0587499 100755 ---- a/bin/ansible-galaxy -+++ b/bin/ansible-galaxy + """ + Upload code coverage reports to codecov.io. + Multiple coverage files from multiple languages are accepted and aggregated after upload. +diff --git a/.azure-pipelines/scripts/time-command.py b/.azure-pipelines/scripts/time-command.py +index 5e8eb8d4c8..5450c48900 100755 +--- a/.azure-pipelines/scripts/time-command.py ++++ b/.azure-pipelines/scripts/time-command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Prepends a relative timestamp to each input line from stdin and writes it to stdout.""" - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-playbook b/bin/ansible-playbook -index 24550b9..0587499 100755 ---- a/bin/ansible-playbook -+++ b/bin/ansible-playbook + from __future__ import (absolute_import, division, print_function) +diff --git a/hacking/ansible-profile b/hacking/ansible-profile +index 9856e7ab5c..0988bb2037 100755 +--- a/hacking/ansible-profile ++++ b/hacking/ansible-profile @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-pull b/bin/ansible-pull -index 24550b9..0587499 100755 ---- a/bin/ansible-pull -+++ b/bin/ansible-pull +diff --git a/hacking/azp/download.py b/hacking/azp/download.py +index e0de99a27a..6ccd51b2aa 100755 +--- a/hacking/azp/download.py ++++ b/hacking/azp/download.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-vault b/bin/ansible-vault -index 24550b9..0587499 100755 ---- a/bin/ansible-vault -+++ b/bin/ansible-vault + # (c) 2016 Red Hat, Inc. +diff --git a/hacking/azp/get_recent_coverage_runs.py b/hacking/azp/get_recent_coverage_runs.py +index 1be867da1e..2fb1cc4582 100755 +--- a/hacking/azp/get_recent_coverage_runs.py ++++ b/hacking/azp/get_recent_coverage_runs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # (c) 2020 Red Hat, Inc. # -diff --git a/contrib/inventory/abiquo.py b/contrib/inventory/abiquo.py -index 405bbbb..d318949 100755 ---- a/contrib/inventory/abiquo.py -+++ b/contrib/inventory/abiquo.py +diff --git a/hacking/azp/incidental.py b/hacking/azp/incidental.py +index 87d4d213c9..7660e2ed22 100755 +--- a/hacking/azp/incidental.py ++++ b/hacking/azp/incidental.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- + # PYTHON_ARGCOMPLETE_OK - ''' -diff --git a/contrib/inventory/apache-libcloud.py b/contrib/inventory/apache-libcloud.py -index 0120d2b..ce92843 100755 ---- a/contrib/inventory/apache-libcloud.py -+++ b/contrib/inventory/apache-libcloud.py + # (c) 2020 Red Hat, Inc. +diff --git a/hacking/azp/run.py b/hacking/azp/run.py +index 00a177944f..591e6bcc4f 100755 +--- a/hacking/azp/run.py ++++ b/hacking/azp/run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK - # (c) 2013, Sebastien Goasguen <runseb@gmail.com> - # -diff --git a/contrib/inventory/apstra_aos.py b/contrib/inventory/apstra_aos.py -index 65838c0..48d293e 100755 ---- a/contrib/inventory/apstra_aos.py -+++ b/contrib/inventory/apstra_aos.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # (c) 2017 Apstra Inc, <community@apstra.com> - # -diff --git a/contrib/inventory/azure_rm.py b/contrib/inventory/azure_rm.py -index 73b8b95..87b31b0 100755 ---- a/contrib/inventory/azure_rm.py -+++ b/contrib/inventory/azure_rm.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (c) 2016 Matt Davis, <mdavis@ansible.com> - # Chris Houseknecht, <house@redhat.com> -diff --git a/contrib/inventory/brook.py b/contrib/inventory/brook.py -index a7d4741..e4de982 100755 ---- a/contrib/inventory/brook.py -+++ b/contrib/inventory/brook.py + # (c) 2016 Red Hat, Inc. +diff --git a/hacking/backport/backport_of_line_adder.py b/hacking/backport/backport_of_line_adder.py +index ef77ddcf40..bbec15de6a 100755 +--- a/hacking/backport/backport_of_line_adder.py ++++ b/hacking/backport/backport_of_line_adder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # Copyright 2016 Doalitic. + # (c) 2020, Red Hat, Inc. <relrod@redhat.com> # # This file is part of Ansible -diff --git a/contrib/inventory/cloudforms.py b/contrib/inventory/cloudforms.py -index 69c149b..202a6c9 100755 ---- a/contrib/inventory/cloudforms.py -+++ b/contrib/inventory/cloudforms.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # vim: set fileencoding=utf-8 : - # - # Copyright (C) 2016 Guido Günther <agx@sigxcpu.org> -diff --git a/contrib/inventory/cloudstack.py b/contrib/inventory/cloudstack.py -index a9b6b9f..d7f05ff 100755 ---- a/contrib/inventory/cloudstack.py -+++ b/contrib/inventory/cloudstack.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # (c) 2015, René Moser <mail@renemoser.net> -diff --git a/contrib/inventory/cobbler.py b/contrib/inventory/cobbler.py -index 89f9bf7..f2a9ff7 100755 ---- a/contrib/inventory/cobbler.py -+++ b/contrib/inventory/cobbler.py +diff --git a/hacking/create-bulk-issues.py b/hacking/create-bulk-issues.py +index d2651415df..2235daa5ec 100755 +--- a/hacking/create-bulk-issues.py ++++ b/hacking/create-bulk-issues.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Create GitHub issues for deprecated features.""" - """ - Cobbler external inventory script -diff --git a/contrib/inventory/collins.py b/contrib/inventory/collins.py -index b7193e2..f0bc2a1 100755 ---- a/contrib/inventory/collins.py -+++ b/contrib/inventory/collins.py +diff --git a/hacking/report.py b/hacking/report.py +index 58b3a6b915..78eed516dc 100755 +--- a/hacking/report.py ++++ b/hacking/report.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """A tool to aggregate data about Ansible source and testing into a sqlite DB for reporting.""" - """ - Collins external inventory script -diff --git a/contrib/inventory/consul_io.py b/contrib/inventory/consul_io.py -index 8106097..2cdc523 100755 ---- a/contrib/inventory/consul_io.py -+++ b/contrib/inventory/consul_io.py +diff --git a/hacking/return_skeleton_generator.py b/hacking/return_skeleton_generator.py +index 7002b7899d..cff03c38e6 100755 +--- a/hacking/return_skeleton_generator.py ++++ b/hacking/return_skeleton_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # (c) 2017, Will Thames <will@thames.id.au> # - # (c) 2015, Steve Gargan <steve.gargan@gmail.com> -diff --git a/contrib/inventory/digital_ocean.py b/contrib/inventory/digital_ocean.py -index 07c124b..0b0e587 100755 ---- a/contrib/inventory/digital_ocean.py -+++ b/contrib/inventory/digital_ocean.py +diff --git a/hacking/test-module.py b/hacking/test-module.py +index 7a329b4b2d..a1118ba144 100755 +--- a/hacking/test-module.py ++++ b/hacking/test-module.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - DigitalOcean external inventory script -diff --git a/contrib/inventory/docker.py b/contrib/inventory/docker.py -index da051dd..9b88d0c 100755 ---- a/contrib/inventory/docker.py -+++ b/contrib/inventory/docker.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 + # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> # - # (c) 2016 Paul Durivage <paul.durivage@gmail.com> - # Chris Houseknecht <house@redhat.com> -diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py -index 03b9820..9c9b2e4 100755 ---- a/contrib/inventory/ec2.py -+++ b/contrib/inventory/ec2.py +diff --git a/hacking/tests/gen_distribution_version_testcase.py b/hacking/tests/gen_distribution_version_testcase.py +index e75c78ad91..1613b02ed5 100755 +--- a/hacking/tests/gen_distribution_version_testcase.py ++++ b/hacking/tests/gen_distribution_version_testcase.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - EC2 external inventory script -diff --git a/contrib/inventory/fleet.py b/contrib/inventory/fleet.py -index 4db4ea1..8790f2b 100755 ---- a/contrib/inventory/fleet.py -+++ b/contrib/inventory/fleet.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 """ - fleetctl base external inventory script. Automatically finds the IPs of the booted coreos instances and - returns it under the host group 'coreos' -diff --git a/contrib/inventory/foreman.py b/contrib/inventory/foreman.py -index 9a87397..2483cce 100755 ---- a/contrib/inventory/foreman.py -+++ b/contrib/inventory/foreman.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # vim: set fileencoding=utf-8 : - # - # Copyright (C) 2016 Guido Günther <agx@sigxcpu.org>, -diff --git a/contrib/inventory/freeipa.py b/contrib/inventory/freeipa.py -index a72b774..1f092b2 100755 ---- a/contrib/inventory/freeipa.py -+++ b/contrib/inventory/freeipa.py + This script generated test_cases for test_distribution_version.py. +diff --git a/hacking/update-sanity-requirements.py b/hacking/update-sanity-requirements.py +index 997d6dbf87..16a47f0f3c 100755 +--- a/hacking/update-sanity-requirements.py ++++ b/hacking/update-sanity-requirements.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Generate frozen sanity test requirements from source requirements files.""" - import argparse - from ipalib import api -diff --git a/contrib/inventory/gce.py b/contrib/inventory/gce.py -index 5c58146..7616843 100755 ---- a/contrib/inventory/gce.py -+++ b/contrib/inventory/gce.py +diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py +index a54dacb70c..dc14986420 100755 +--- a/lib/ansible/cli/adhoc.py ++++ b/lib/ansible/cli/adhoc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # Copyright 2013 Google Inc. - # - # This file is part of Ansible -diff --git a/contrib/inventory/jail.py b/contrib/inventory/jail.py -index 98b6acf..b12289c 100755 ---- a/contrib/inventory/jail.py -+++ b/contrib/inventory/jail.py + # Copyright: (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py +index f394ef7c1e..e37c9fd619 100755 +--- a/lib/ansible/cli/config.py ++++ b/lib/ansible/cli/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2013, Michael Scherer <misc@zarb.org> - # -diff --git a/contrib/inventory/landscape.py b/contrib/inventory/landscape.py -index 4b53171..7f52639 100755 ---- a/contrib/inventory/landscape.py -+++ b/contrib/inventory/landscape.py + # Copyright: (c) 2017, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + # PYTHON_ARGCOMPLETE_OK +diff --git a/lib/ansible/cli/console.py b/lib/ansible/cli/console.py +index 2325bf05d6..475f03eb00 100755 +--- a/lib/ansible/cli/console.py ++++ b/lib/ansible/cli/console.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2015, Marc Abramowitz <marca@surveymonkey.com> - # -diff --git a/contrib/inventory/libvirt_lxc.py b/contrib/inventory/libvirt_lxc.py -index 35ccf40..ba3496d 100755 ---- a/contrib/inventory/libvirt_lxc.py -+++ b/contrib/inventory/libvirt_lxc.py + # Copyright: (c) 2014, Nandor Sivok <dominis@haxor.hu> + # Copyright: (c) 2016, Redhat Inc + # Copyright: (c) 2018, Ansible Project +diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py +index 4a5c892816..c99d25d9cb 100755 +--- a/lib/ansible/cli/doc.py ++++ b/lib/ansible/cli/doc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2013, Michael Scherer <misc@zarb.org> - # -diff --git a/contrib/inventory/linode.py b/contrib/inventory/linode.py -index 6fd922f..cab7a70 100755 ---- a/contrib/inventory/linode.py -+++ b/contrib/inventory/linode.py + # Copyright: (c) 2014, James Tanner <tanner.jc@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py +index 334e4bf4f0..9918f338c1 100755 +--- a/lib/ansible/cli/galaxy.py ++++ b/lib/ansible/cli/galaxy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - ''' - Linode external inventory script -diff --git a/contrib/inventory/lxc_inventory.py b/contrib/inventory/lxc_inventory.py -index d82bb61..f7ac67c 100755 ---- a/contrib/inventory/lxc_inventory.py -+++ b/contrib/inventory/lxc_inventory.py + # Copyright: (c) 2013, James Cammarata <jcammarata@ansible.com> + # Copyright: (c) 2018-2021, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/inventory.py b/lib/ansible/cli/inventory.py +index 3550079bf8..f1da0d0531 100755 +--- a/lib/ansible/cli/inventory.py ++++ b/lib/ansible/cli/inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # - # (c) 2015-16 Florian Haas, hastexo Professional Services GmbH - # <florian@hastexo.com> -diff --git a/contrib/inventory/mdt_dynamic_inventory.py b/contrib/inventory/mdt_dynamic_inventory.py -index 89ecc3e..5540a41 100755 ---- a/contrib/inventory/mdt_dynamic_inventory.py -+++ b/contrib/inventory/mdt_dynamic_inventory.py + # Copyright: (c) 2017, Brian Coca <bcoca@ansible.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/playbook.py b/lib/ansible/cli/playbook.py +index e63785b058..bc5fbc2f6f 100755 +--- a/lib/ansible/cli/playbook.py ++++ b/lib/ansible/cli/playbook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2016, Julian Barnett <jbarnett@tableau.com> - # -diff --git a/contrib/inventory/nagios_livestatus.py b/contrib/inventory/nagios_livestatus.py -index e1c145e..3e250cb 100755 ---- a/contrib/inventory/nagios_livestatus.py -+++ b/contrib/inventory/nagios_livestatus.py + # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py +index f369c390ec..f0ca673b36 100755 +--- a/lib/ansible/cli/pull.py ++++ b/lib/ansible/cli/pull.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2015, Yannig Perre <yannig.perre@gmail.com> - # -diff --git a/contrib/inventory/nagios_ndo.py b/contrib/inventory/nagios_ndo.py -index 49ec563..cc10a51 100755 ---- a/contrib/inventory/nagios_ndo.py -+++ b/contrib/inventory/nagios_ndo.py + # Copyright: (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py +index b1ed18c9c6..03c26d52cb 100755 +--- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py ++++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2014, Jonathan Lestrelin <jonathan.lestrelin@gmail.com> - # -diff --git a/contrib/inventory/nova.py b/contrib/inventory/nova.py -index f8c1617..d0ad7f0 100755 ---- a/contrib/inventory/nova.py -+++ b/contrib/inventory/nova.py + # Copyright: (c) 2017, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + from __future__ import (absolute_import, division, print_function) +diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py +index cf2c9dd901..3545624a09 100755 +--- a/lib/ansible/cli/vault.py ++++ b/lib/ansible/cli/vault.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> - # -diff --git a/contrib/inventory/nsot.py b/contrib/inventory/nsot.py -index 62be85a..0a8dc9b 100755 ---- a/contrib/inventory/nsot.py -+++ b/contrib/inventory/nsot.py + # (c) 2014, James Tanner <tanner.jc@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/packaging/cli-doc/build.py b/packaging/cli-doc/build.py +index 878ba8eabf..64a614f3f7 100755 +--- a/packaging/cli-doc/build.py ++++ b/packaging/cli-doc/build.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Build documentation for ansible-core CLI programs.""" - ''' - nsot -diff --git a/contrib/inventory/openshift.py b/contrib/inventory/openshift.py -index 479b808..dc398b5 100755 ---- a/contrib/inventory/openshift.py -+++ b/contrib/inventory/openshift.py +diff --git a/packaging/release.py b/packaging/release.py +index 97c58a7424..fa5a27f794 100755 +--- a/packaging/release.py ++++ b/packaging/release.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Manage upstream ansible-core releases.""" - # (c) 2013, Michael Scherer <misc@zarb.org> - # -diff --git a/contrib/inventory/openstack.py b/contrib/inventory/openstack.py -index 6679a2c..eb38742 100755 ---- a/contrib/inventory/openstack.py -+++ b/contrib/inventory/openstack.py +diff --git a/test/integration/targets/ansible-config/files/ini_dupes.py b/test/integration/targets/ansible-config/files/ini_dupes.py +index ed42e6acb8..e61252100e 100755 +--- a/test/integration/targets/ansible-config/files/ini_dupes.py ++++ b/test/integration/targets/ansible-config/files/ini_dupes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # Copyright (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> - # Copyright (c) 2013, Jesse Keating <jesse.keating@rackspace.com> -diff --git a/contrib/inventory/openvz.py b/contrib/inventory/openvz.py -index 1ef8ab1..d4dfcde 100755 ---- a/contrib/inventory/openvz.py -+++ b/contrib/inventory/openvz.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # openvz.py -diff --git a/contrib/inventory/ovirt.py b/contrib/inventory/ovirt.py -index 7f505d9..ada01fa 100755 ---- a/contrib/inventory/ovirt.py -+++ b/contrib/inventory/ovirt.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Copyright 2015 IIX Inc. - # - # This file is part of Ansible -diff --git a/contrib/inventory/ovirt4.py b/contrib/inventory/ovirt4.py -index 5ee5986..9d9e940 100755 ---- a/contrib/inventory/ovirt4.py -+++ b/contrib/inventory/ovirt4.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. -diff --git a/contrib/inventory/packet_net.py b/contrib/inventory/packet_net.py -index c40c821..d23eba1 100755 ---- a/contrib/inventory/packet_net.py -+++ b/contrib/inventory/packet_net.py + from __future__ import annotations +diff --git a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py +index 6182e865db..5829df52b5 100644 +--- a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py ++++ b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - Packet.net external inventory script -diff --git a/contrib/inventory/proxmox.py b/contrib/inventory/proxmox.py -index c0ffb0b..ef7a394 100755 ---- a/contrib/inventory/proxmox.py -+++ b/contrib/inventory/proxmox.py + # Copyright: (c) 2020, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py b/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py +index 487666381f..86a3ea66d7 100755 +--- a/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py ++++ b/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Create a role archive which overwrites an arbitrary file.""" - # Copyright (C) 2014 Mathieu GAUTHIER-LAFAYE <gauthierl@lapth.cnrs.fr> - # -diff --git a/contrib/inventory/rackhd.py b/contrib/inventory/rackhd.py -index a89cb04..05b3ada 100755 ---- a/contrib/inventory/rackhd.py -+++ b/contrib/inventory/rackhd.py + import argparse +diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py +index 3c86b6dd07..393a945ff9 100755 +--- a/test/integration/targets/ansible-test-container/runme.py ++++ b/test/integration/targets/ansible-test-container/runme.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Test suite used to verify ansible-test is able to run its containers on various container hosts.""" - import json - import requests -diff --git a/contrib/inventory/rax.py b/contrib/inventory/rax.py -index d20a8ab..6c34753 100755 ---- a/contrib/inventory/rax.py -+++ b/contrib/inventory/rax.py + from __future__ import annotations +diff --git a/test/integration/targets/ansible-test-integration-targets/test.py b/test/integration/targets/ansible-test-integration-targets/test.py +index 8effb647fc..4e34c4bbc1 100755 +--- a/test/integration/targets/ansible-test-integration-targets/test.py ++++ b/test/integration/targets/ansible-test-integration-targets/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # (c) 2013, Jesse Keating <jesse.keating@rackspace.com, - # Paul Durivage <paul.durivage@rackspace.com>, -diff --git a/contrib/inventory/rhv.py b/contrib/inventory/rhv.py -index 5ee5986..9d9e940 100755 ---- a/contrib/inventory/rhv.py -+++ b/contrib/inventory/rhv.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. -diff --git a/contrib/inventory/rudder.py b/contrib/inventory/rudder.py -index 5cf16c9..a669c37 100755 ---- a/contrib/inventory/rudder.py -+++ b/contrib/inventory/rudder.py + import subprocess + import unittest +diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py +index 463915284b..fc2ed398d9 100755 +--- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py ++++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Run a command using a PTY.""" - # Copyright (c) 2015, Normation SAS - # -diff --git a/contrib/inventory/serf.py b/contrib/inventory/serf.py -index e1340da..6242eda 100755 ---- a/contrib/inventory/serf.py -+++ b/contrib/inventory/serf.py + import sys +diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py +index a2b094e2fc..355dba697a 100755 +--- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py ++++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Assert no TTY is available.""" - # (c) 2015, Marc Abramowitz <marca@surveymonkey.com> - # -diff --git a/contrib/inventory/softlayer.py b/contrib/inventory/softlayer.py -index 3933eb4..519092f 100755 ---- a/contrib/inventory/softlayer.py -+++ b/contrib/inventory/softlayer.py -@@ -1,4 +1,4 @@ + import sys +diff --git a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py +index 4265cc3e6c..e5a0d9b483 100755 +--- a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py ++++ b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py +@@ -1 +1 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """ - SoftLayer external inventory script. - -diff --git a/contrib/inventory/spacewalk.py b/contrib/inventory/spacewalk.py -index 2735a81..2da2720 100755 ---- a/contrib/inventory/spacewalk.py -+++ b/contrib/inventory/spacewalk.py -@@ -1,4 +1,4 @@ +diff --git a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py +index 4265cc3e6c..e5a0d9b483 100755 +--- a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py ++++ b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py +@@ -1 +1 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - """ - Spacewalk external inventory script -diff --git a/contrib/inventory/ssh_config.py b/contrib/inventory/ssh_config.py -index ae41e58..05373ec 100755 ---- a/contrib/inventory/ssh_config.py -+++ b/contrib/inventory/ssh_config.py +diff --git a/test/integration/targets/ansible-test/venv-pythons.py b/test/integration/targets/ansible-test/venv-pythons.py +index 97998bcd7c..aace3d346d 100755 +--- a/test/integration/targets/ansible-test/venv-pythons.py ++++ b/test/integration/targets/ansible-test/venv-pythons.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Return target Python options for use with ansible-test.""" - # (c) 2014, Tomas Karasek <tomas.karasek@digile.fi> - # -diff --git a/contrib/inventory/stacki.py b/contrib/inventory/stacki.py -index fd4cda5..d6acda3 100755 ---- a/contrib/inventory/stacki.py -+++ b/contrib/inventory/stacki.py + import argparse +diff --git a/test/integration/targets/ansible-vault/faux-editor.py b/test/integration/targets/ansible-vault/faux-editor.py +index b67c747563..a30c306a83 100755 +--- a/test/integration/targets/ansible-vault/faux-editor.py ++++ b/test/integration/targets/ansible-vault/faux-editor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # Copyright (c) 2016, Hugh Ma <hugh.ma@flextronics.com> # -diff --git a/contrib/inventory/vagrant.py b/contrib/inventory/vagrant.py -index 37a6741..86fc67d 100755 ---- a/contrib/inventory/vagrant.py -+++ b/contrib/inventory/vagrant.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Vagrant external inventory script. Automatically finds the IP of the booted vagrant vm(s), and - returns it under the host group 'vagrant' -diff --git a/contrib/inventory/vbox.py b/contrib/inventory/vbox.py -index 8905fab..141b01a 100755 ---- a/contrib/inventory/vbox.py -+++ b/contrib/inventory/vbox.py + # Ansible is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +diff --git a/test/integration/targets/ansible-vault/password-script.py b/test/integration/targets/ansible-vault/password-script.py +index 1b7f02beb2..0dcada23c7 100755 +--- a/test/integration/targets/ansible-vault/password-script.py ++++ b/test/integration/targets/ansible-vault/password-script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # This file is part of Ansible, # -diff --git a/contrib/inventory/vmware.py b/contrib/inventory/vmware.py -index 377c7cb..cee232a 100755 ---- a/contrib/inventory/vmware.py -+++ b/contrib/inventory/vmware.py + # Ansible is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +diff --git a/test/integration/targets/ansible-vault/test-vault-client.py b/test/integration/targets/ansible-vault/test-vault-client.py +index ee46188742..48244fca09 100755 +--- a/test/integration/targets/ansible-vault/test-vault-client.py ++++ b/test/integration/targets/ansible-vault/test-vault-client.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- - ''' - VMware Inventory Script -diff --git a/contrib/inventory/vmware_inventory.py b/contrib/inventory/vmware_inventory.py -index 58ee473..4300fe5 100755 ---- a/contrib/inventory/vmware_inventory.py -+++ b/contrib/inventory/vmware_inventory.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Requirements - # - pyvmomi >= 6.0.0.2016.4 -diff --git a/contrib/inventory/windows_azure.py b/contrib/inventory/windows_azure.py -index cceed36..f8777be 100755 ---- a/contrib/inventory/windows_azure.py -+++ b/contrib/inventory/windows_azure.py + from __future__ import (absolute_import, division, print_function) +diff --git a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py +index 93958fc2ad..33509c826a 100644 +--- a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py ++++ b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - Windows Azure external inventory script -diff --git a/contrib/inventory/zabbix.py b/contrib/inventory/zabbix.py -index f6b37b9..241823b 100755 ---- a/contrib/inventory/zabbix.py -+++ b/contrib/inventory/zabbix.py + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/cli/test-cli.py b/test/integration/targets/cli/test-cli.py +index 9893d6652e..7a07dcc108 100644 +--- a/test/integration/targets/cli/test-cli.py ++++ b/test/integration/targets/cli/test-cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # Copyright (c) 2019 Matt Martz <matt@sivel.net> + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # (c) 2013, Greg Buehler - # -diff --git a/contrib/inventory/zone.py b/contrib/inventory/zone.py -index 893953e..b049fd7 100755 ---- a/contrib/inventory/zone.py -+++ b/contrib/inventory/zone.py +diff --git a/test/integration/targets/cli/test_k_and_K.py b/test/integration/targets/cli/test_k_and_K.py +index f7077fba0a..dcc9614129 100644 +--- a/test/integration/targets/cli/test_k_and_K.py ++++ b/test/integration/targets/cli/test_k_and_K.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # (c) 2015, Dagobert Michelsen <dam@baltic-online.de> - # -diff --git a/docs/docsite/rst/dev_guide/developing_api.rst b/docs/docsite/rst/dev_guide/developing_api.rst -index bb2cbc4..55d4212 100644 ---- a/docs/docsite/rst/dev_guide/developing_api.rst -+++ b/docs/docsite/rst/dev_guide/developing_api.rst -@@ -37,7 +37,7 @@ Python API 2.0 - In 2.0 things get a bit more complicated to start, but you end up with much more discrete and readable classes:: - - -- #!/usr/bin/env python -+ #!/usr/bin/env python3 - - import json - from collections import namedtuple -diff --git a/hacking/dump_playbook_attributes.py b/hacking/dump_playbook_attributes.py -index 204fe3f..9d86b66 100755 ---- a/hacking/dump_playbook_attributes.py -+++ b/hacking/dump_playbook_attributes.py + # Make coding more python3-ish +diff --git a/test/integration/targets/collection/update-ignore.py b/test/integration/targets/collection/update-ignore.py +index 92a702cf13..9ea69089d5 100755 +--- a/test/integration/targets/collection/update-ignore.py ++++ b/test/integration/targets/collection/update-ignore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Rewrite a sanity ignore file to expand Python versions for import ignores and write the file out with the correct Ansible version in the name.""" - import optparse - from jinja2 import Environment, FileSystemLoader -diff --git a/hacking/module_formatter.py b/hacking/module_formatter.py -index 4f132aa..1bee33a 100755 ---- a/hacking/module_formatter.py -+++ b/hacking/module_formatter.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # (c) 2012, Jan-Piet Mens <jpmens () gmail.com> - # (c) 2012-2014, Michael DeHaan <michael@ansible.com> and others - # -diff --git a/lib/ansible/modules/web_infrastructure/django_manage.py b/lib/ansible/modules/web_infrastructure/django_manage.py -index ac24829..90aee1b 100644 ---- a/lib/ansible/modules/web_infrastructure/django_manage.py -+++ b/lib/ansible/modules/web_infrastructure/django_manage.py -@@ -97,7 +97,7 @@ notes: - - This module assumes English error messages for the 'createcachetable' command to detect table existence, unfortunately. - - To be able to use the migrate command with django versions < 1.7, you must have south installed and added as an app in your settings. - - To be able to use the collectstatic command, you must have enabled staticfiles in your settings. -- - As of ansible 2.x, your I(manage.py) application must be executable (rwxr-xr-x), and must have a valid I(shebang), i.e. "#!/usr/bin/env python", for invoking the appropriate Python interpreter. -+ - As of ansible 2.x, your I(manage.py) application must be executable (rwxr-xr-x), and must have a valid I(shebang), i.e. "#!/usr/bin/env python3", for invoking the appropriate Python interpreter. - requirements: [ "virtualenv", "django" ] - author: "Scott Anderson (@tastychutney)" - ''' -diff --git a/lib/ansible/modules/windows/win_file_version.py b/lib/ansible/modules/windows/win_file_version.py -index 399c978..1225a06 100644 ---- a/lib/ansible/modules/windows/win_file_version.py -+++ b/lib/ansible/modules/windows/win_file_version.py + import os +diff --git a/test/integration/targets/debugger/test_run_once.py b/test/integration/targets/debugger/test_run_once.py +index 237f9c2d90..4fe74903d8 100755 +--- a/test/integration/targets/debugger/test_run_once.py ++++ b/test/integration/targets/debugger/test_run_once.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Get DLL or EXE build version -diff --git a/lib/ansible/modules/windows/win_firewall_rule.py b/lib/ansible/modules/windows/win_firewall_rule.py -index e4ab1e4..456523d 100644 ---- a/lib/ansible/modules/windows/win_firewall_rule.py -+++ b/lib/ansible/modules/windows/win_firewall_rule.py + import io + import os +diff --git a/test/integration/targets/fork_safe_stdio/run-with-pty.py b/test/integration/targets/fork_safe_stdio/run-with-pty.py +index 463915284b..fc2ed398d9 100755 +--- a/test/integration/targets/fork_safe_stdio/run-with-pty.py ++++ b/test/integration/targets/fork_safe_stdio/run-with-pty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Run a command using a PTY.""" - # (c) 2014, Timothy Vandenbrande <timothy.vandenbrande@gmail.com> - # -diff --git a/test/compile/compile.py b/test/compile/compile.py -index 01144c6..6e332a9 100755 ---- a/test/compile/compile.py -+++ b/test/compile/compile.py + import sys +diff --git a/test/integration/targets/gathering/uuid.fact b/test/integration/targets/gathering/uuid.fact +index 79e3f62677..2a294b33a8 100644 +--- a/test/integration/targets/gathering/uuid.fact ++++ b/test/integration/targets/gathering/uuid.fact @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Python syntax checker with lint friendly output.""" + # -*- coding: utf-8 -*- - import os -diff --git a/test/integration/cleanup_rax.py b/test/integration/cleanup_rax.py -index 5c757f5..bc3448b 100755 ---- a/test/integration/cleanup_rax.py -+++ b/test/integration/cleanup_rax.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import os - import re -diff --git a/test/integration/targets/embedded_module/library/test_integration_module b/test/integration/targets/embedded_module/library/test_integration_module -index f564619..0d46d15 100644 ---- a/test/integration/targets/embedded_module/library/test_integration_module -+++ b/test/integration/targets/embedded_module/library/test_integration_module -@@ -1,3 +1,3 @@ +diff --git a/test/integration/targets/gathering_facts/uuid.fact b/test/integration/targets/gathering_facts/uuid.fact +index 79e3f62677..2a294b33a8 100644 +--- a/test/integration/targets/gathering_facts/uuid.fact ++++ b/test/integration/targets/gathering_facts/uuid.fact +@@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # -*- coding: utf-8 -*- - print('{"changed":false, "msg":"this is the embedded module"}') -diff --git a/test/integration/targets/module_utils/module_utils/foo.py b/test/integration/targets/module_utils/module_utils/foo.py -index 20698f1..0cd5c85 100644 ---- a/test/integration/targets/module_utils/module_utils/foo.py -+++ b/test/integration/targets/module_utils/module_utils/foo.py -@@ -1,3 +1,3 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - foo = "FOO FROM foo.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bam.py b/test/integration/targets/module_utils/module_utils/sub/bam.py -index 566f8b7..0814485 100644 +index 566f8b7c47..0814485d5f 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam.py @@ -1,3 +1,3 @@ @@ -811,7 +560,7 @@ index 566f8b7..0814485 100644 bam = "BAM FROM sub/bam.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py -index b7ed707..97f9eed 100644 +index b7ed707211..97f9eedcdb 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py @@ -1,3 +1,3 @@ @@ -819,414 +568,155 @@ index b7ed707..97f9eed 100644 +#!/usr/bin/env python3 bam = "BAM FROM sub/bam/bam.py" -diff --git a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py -index 02fafd4..3a93360 100644 ---- a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py -+++ b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py -@@ -1,3 +1,3 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - bam = "BAM FROM sub/bar/bam.py" -diff --git a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py -index 8566901..40f0c94 100644 ---- a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py -+++ b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py -@@ -1,3 +1,3 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - bar = "BAR FROM sub/bar/bar.py" -diff --git a/test/integration/targets/service/files/ansible_test_service b/test/integration/targets/service/files/ansible_test_service -index 682edeb..e858909 100755 ---- a/test/integration/targets/service/files/ansible_test_service -+++ b/test/integration/targets/service/files/ansible_test_service -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # this is mostly based off of the code found here: - # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ -diff --git a/test/runner/ansible-test b/test/runner/ansible-test -index 801f07f..804aa8f 100755 ---- a/test/runner/ansible-test -+++ b/test/runner/ansible-test -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - """Test runner for all Ansible tests.""" - -diff --git a/test/runner/injector/ansible b/test/runner/injector/ansible -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible -+++ b/test/runner/injector/ansible -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-console b/test/runner/injector/ansible-console -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-console -+++ b/test/runner/injector/ansible-console -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-doc b/test/runner/injector/ansible-doc -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-doc -+++ b/test/runner/injector/ansible-doc -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-galaxy b/test/runner/injector/ansible-galaxy -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-galaxy -+++ b/test/runner/injector/ansible-galaxy -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-playbook b/test/runner/injector/ansible-playbook -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-playbook -+++ b/test/runner/injector/ansible-playbook -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-pull b/test/runner/injector/ansible-pull -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-pull -+++ b/test/runner/injector/ansible-pull -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-vault b/test/runner/injector/ansible-vault -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-vault -+++ b/test/runner/injector/ansible-vault -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover b/test/runner/injector/cover -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover -+++ b/test/runner/injector/cover -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2 b/test/runner/injector/cover2 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2 -+++ b/test/runner/injector/cover2 +diff --git a/test/integration/targets/packaging_cli-doc/verify.py b/test/integration/targets/packaging_cli-doc/verify.py +index 7793fa8c24..71f82186dd 100755 +--- a/test/integration/targets/packaging_cli-doc/verify.py ++++ b/test/integration/targets/packaging_cli-doc/verify.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2.4 b/test/runner/injector/cover2.4 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2.4 -+++ b/test/runner/injector/cover2.4 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2.6 b/test/runner/injector/cover2.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2.6 -+++ b/test/runner/injector/cover2.6 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2.7 b/test/runner/injector/cover2.7 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2.7 -+++ b/test/runner/injector/cover2.7 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover3 b/test/runner/injector/cover3 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover3 -+++ b/test/runner/injector/cover3 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover3.5 b/test/runner/injector/cover3.5 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover3.5 -+++ b/test/runner/injector/cover3.5 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover3.6 b/test/runner/injector/cover3.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover3.6 -+++ b/test/runner/injector/cover3.6 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/injector.py b/test/runner/injector/injector.py -index 57241c9..c463946 100755 ---- a/test/runner/injector/injector.py -+++ b/test/runner/injector/injector.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/pytest b/test/runner/injector/pytest -index 57241c9..c463946 100755 ---- a/test/runner/injector/pytest -+++ b/test/runner/injector/pytest -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner b/test/runner/injector/runner -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner -+++ b/test/runner/injector/runner -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2 b/test/runner/injector/runner2 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2 -+++ b/test/runner/injector/runner2 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2.4 b/test/runner/injector/runner2.4 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2.4 -+++ b/test/runner/injector/runner2.4 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2.6 b/test/runner/injector/runner2.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2.6 -+++ b/test/runner/injector/runner2.6 + import os + import pathlib +diff --git a/test/integration/targets/pause/test-pause.py b/test/integration/targets/pause/test-pause.py +index ab771fa09e..1dece083d3 100755 +--- a/test/integration/targets/pause/test-pause.py ++++ b/test/integration/targets/pause/test-pause.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2.7 b/test/runner/injector/runner2.7 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2.7 -+++ b/test/runner/injector/runner2.7 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/pip/files/setup.py b/test/integration/targets/pip/files/setup.py +index aaf21875ca..2835719e4f 100755 +--- a/test/integration/targets/pip/files/setup.py ++++ b/test/integration/targets/pip/files/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner3 b/test/runner/injector/runner3 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner3 -+++ b/test/runner/injector/runner3 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/service/files/ansible_test_service.py b/test/integration/targets/service/files/ansible_test_service.py +index 6292272e63..e5664fb2e3 100644 +--- a/test/integration/targets/service/files/ansible_test_service.py ++++ b/test/integration/targets/service/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner3.5 b/test/runner/injector/runner3.5 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner3.5 -+++ b/test/runner/injector/runner3.5 + # this is mostly based off of the code found here: + # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ +diff --git a/test/integration/targets/service_facts/files/ansible_test_service.py b/test/integration/targets/service_facts/files/ansible_test_service.py +index 19f1e29138..609218325d 100644 +--- a/test/integration/targets/service_facts/files/ansible_test_service.py ++++ b/test/integration/targets/service_facts/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner3.6 b/test/runner/injector/runner3.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner3.6 -+++ b/test/runner/injector/runner3.6 + # this is mostly based off of the code found here: + # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ +diff --git a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py +index b0a8889439..90c83b582b 100644 +--- a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py ++++ b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/retry.py b/test/runner/retry.py -index 4972131..a9ffb07 100755 ---- a/test/runner/retry.py -+++ b/test/runner/retry.py + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/test_utils/scripts/timeout.py b/test/integration/targets/test_utils/scripts/timeout.py +index f88f3e4e15..c312dc4f6c 100755 +--- a/test/integration/targets/test_utils/scripts/timeout.py ++++ b/test/integration/targets/test_utils/scripts/timeout.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - """Automatically retry failed commands.""" -diff --git a/test/runner/test.py b/test/runner/test.py -index 801f07f..804aa8f 100755 ---- a/test/runner/test.py -+++ b/test/runner/test.py + import argparse + import subprocess +diff --git a/test/integration/targets/throttle/test_throttle.py b/test/integration/targets/throttle/test_throttle.py +index 1a5bdd3078..344bcf0f86 100755 +--- a/test/integration/targets/throttle/test_throttle.py ++++ b/test/integration/targets/throttle/test_throttle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - """Test runner for all Ansible tests.""" -diff --git a/test/sanity/code-smell/ansible-var-precedence-check.py b/test/sanity/code-smell/ansible-var-precedence-check.py -index e10c097..13c7a73 100755 ---- a/test/sanity/code-smell/ansible-var-precedence-check.py -+++ b/test/sanity/code-smell/ansible-var-precedence-check.py + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/var_precedence/ansible-var-precedence-check.py b/test/integration/targets/var_precedence/ansible-var-precedence-check.py +index b03c87b80f..2035463092 100755 +--- a/test/integration/targets/var_precedence/ansible-var-precedence-check.py ++++ b/test/integration/targets/var_precedence/ansible-var-precedence-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # A tool to check the order of precedence for ansible variables # https://github.com/ansible/ansible/blob/devel/test/integration/test_var_precedence.yml -diff --git a/test/sanity/code-smell/integration-aliases.py b/test/sanity/code-smell/integration-aliases.py -index 50301e3..ac53ca9 100755 ---- a/test/sanity/code-smell/integration-aliases.py -+++ b/test/sanity/code-smell/integration-aliases.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import os - import textwrap -diff --git a/test/sanity/code-smell/shebang.sh b/test/sanity/code-smell/shebang.sh -index 76d72c1..565a198 100755 ---- a/test/sanity/code-smell/shebang.sh -+++ b/test/sanity/code-smell/shebang.sh -@@ -8,11 +8,11 @@ grep '^#!' -rIn . \ - -e '^\./test/integration/targets/[^/]*/library/[^/]*:#!powershell$' \ - -e '^\./test/integration/targets/[^/]*/library/[^/]*:#!/usr/bin/python$' \ - -e '^\./test/integration/targets/module_precedence/.*lib.*:#!/usr/bin/python$' \ -- -e '^\./hacking/cherrypick.py:#!/usr/bin/env python3$' \ -+ -e '^\./hacking/cherrypick.py:#!/usr/bin/env python33$' \ - -e ':#!/bin/sh$' \ - -e ':#!/bin/bash( -[eux]|$)' \ - -e ':#!/usr/bin/make -f$' \ -- -e ':#!/usr/bin/env python$' \ -+ -e ':#!/usr/bin/env python3$' \ - -e ':#!/usr/bin/env bash$' \ - -e ':#!/usr/bin/env fish$' \ - -diff --git a/test/sanity/validate-modules/test_validate_modules_regex.py b/test/sanity/validate-modules/test_validate_modules_regex.py -index 0e41ee7..8a86b07 100644 ---- a/test/sanity/validate-modules/test_validate_modules_regex.py -+++ b/test/sanity/validate-modules/test_validate_modules_regex.py +diff --git a/test/lib/ansible_test/_internal/util_common.py b/test/lib/ansible_test/_internal/util_common.py +index 77a6165c8e..865158e3b1 100644 +--- a/test/lib/ansible_test/_internal/util_common.py ++++ b/test/lib/ansible_test/_internal/util_common.py +@@ -303,7 +303,7 @@ def get_injector_path() -> str: + ]) + + scripts = ( +- ('python.py', '/usr/bin/env python', MODE_FILE_EXECUTE), ++ ('python.py', '/usr/bin/env python3', MODE_FILE_EXECUTE), + ('virtualenv.sh', '/usr/bin/env bash', MODE_FILE), + ) + +diff --git a/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py b/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py +index b0b1319783..9535c3b481 100644 +--- a/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py ++++ b/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py +@@ -16,14 +16,14 @@ def main(): + b'#!/usr/bin/env bash', + b'#!/usr/bin/env fish', + b'#!/usr/bin/env pwsh', +- b'#!/usr/bin/env python', ++ b'#!/usr/bin/env python3', + b'#!/usr/bin/make -f', + ]) + + integration_shebangs = set([ + b'#!/bin/sh', + b'#!/usr/bin/env bash', +- b'#!/usr/bin/env python', ++ b'#!/usr/bin/env python3', + ]) + + module_shebangs = { +diff --git a/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py b/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py +index 930654fc1e..bbf50369d7 100755 +--- a/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py ++++ b/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Command line entry point for ansible-test.""" - # This is a standalone test for the regex inside validate-modules - # It is not suitable to add to the make tests target because the -diff --git a/test/sanity/validate-modules/validate-modules b/test/sanity/validate-modules/validate-modules -index d03bff1..201cd41 100755 ---- a/test/sanity/validate-modules/validate-modules -+++ b/test/sanity/validate-modules/validate-modules -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # Copyright (C) 2015 Matt Martz <matt@sivel.net> diff --git a/test/units/executor/module_common/test_module_common.py b/test/units/executor/module_common/test_module_common.py -index edbf836..1f3bb5a 100644 +index 6e2a4956c4..6776de66e1 100644 --- a/test/units/executor/module_common/test_module_common.py +++ b/test/units/executor/module_common/test_module_common.py -@@ -114,5 +114,5 @@ class TestGetShebang(object): +@@ -117,8 +117,8 @@ class TestGetShebang: (u'#!/usr/bin/python3 -tt -OO', u'/usr/bin/python3') - def test_python_via_env(self): -- assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python'}) == \ + def test_python_via_env(self, templar): +- assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python'}, templar) == \ - (u'#!/usr/bin/env python', u'/usr/bin/env python') -+ assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python3'}) == \ -+ (u'#!/usr/bin/env python3', u'/usr/bin/env python') -diff --git a/test/units/modules/network/nxos/test_nxos_config.py b/test/units/modules/network/nxos/test_nxos_config.py -index 8e3a59c..46764a8 100644 ---- a/test/units/modules/network/nxos/test_nxos_config.py -+++ b/test/units/modules/network/nxos/test_nxos_config.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # (c) 2016 Red Hat Inc. - # -diff --git a/test/utils/shippable/ansible-core-ci b/test/utils/shippable/ansible-core-ci -index e91b426..44f8fb9 100755 ---- a/test/utils/shippable/ansible-core-ci -+++ b/test/utils/shippable/ansible-core-ci -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 ++ assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python3'}, templar) == \ ++ (u'#!/usr/bin/env python3', u'/usr/bin/env python3') - # (c) 2016 Matt Clay <matt@mystile.com> - # -diff --git a/test/utils/shippable/download.py b/test/utils/shippable/download.py -index cbda144..e86c8e6 100755 ---- a/test/utils/shippable/download.py -+++ b/test/utils/shippable/download.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - # (c) 2016 Red Hat, Inc. + class TestDetectionRegexes: -- -2.7.4 +2.25.1 diff --git a/recipes-devtools/python/python3-ansible_2.3.1.0.bb b/recipes-devtools/python/python3-ansible_2.16.5.bb index 55dd118e..f3ab2377 100644 --- a/recipes-devtools/python/python3-ansible_2.3.1.0.bb +++ b/recipes-devtools/python/python3-ansible_2.16.5.bb @@ -1,7 +1,11 @@ inherit setuptools3 require python-ansible.inc -RDEPENDS_${PN} += "python3-pyyaml python3-jinja2 python3-modules" +RDEPENDS:${PN} += "python3-pyyaml \ + python3-jinja2 \ + python3-modules \ + locale-base-en-us \ +" SRC_URI += " \ file://python3-ensure-py-scripts-use-py3-for-shebang.patch \ diff --git a/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch new file mode 100644 index 00000000..1cdccf99 --- /dev/null +++ b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch @@ -0,0 +1,88 @@ +From f66bd85af09397300ad434655fc68861f48c2e3c Mon Sep 17 00:00:00 2001 +From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com> +Date: Thu, 2 Jan 2020 07:46:23 -0500 +Subject: [PATCH] cli: duplicate defns of cli_default_conn_timeout and + cli_ten_minutes_timeout + +Winter is coming. So is gcc-10. + +Compiling with gcc-10-20191219 snapshot reveals dupe defns of +cli_default_conn_timeout and cli_ten_minutes_timeout in +.../cli/src/cli.[ch] due to missing extern decl. + +There are many changes coming in gcc-10 described in +https://gcc.gnu.org/gcc-10/changes.html + +compiling cli.c with gcc-9 we see: + ... + .quad .LC88 + .comm cli_ten_minutes_timeout,4,4 + .comm cli_default_conn_timeout,4,4 + .text + .Letext0: + ... + +and with gcc-10: + ... + .quad .LC88 + .globl cli_ten_minutes_timeout + .bss + .align 4 + .type cli_ten_minutes_timeout, @object + .size cli_ten_minutes_timeout, 4 + cli_ten_minutes_timeout: + .zero 4 + .globl cli_default_conn_timeout + .align 4 + .type cli_default_conn_timeout, @object + .size cli_default_conn_timeout, 4 + cli_default_conn_timeout: + .zero 4 + .text + .Letext0: + ... + +which is reflected in the .o file as (gcc-9): +... +0000000000000004 C cli_ten_minutes_timeout +0000000000000004 C cli_default_conn_timeout +... + +and (gcc-10): +... +0000000000000020 B cli_ten_minutes_timeout +0000000000000024 B cli_default_conn_timeout +... + +See nm(1) and ld(1) for a description C (common) and B (BSS) and how +they are treated by the linker. + +Note: there is still a small chance that gcc-10 will land in Fedora-32, +despite 31 Dec. 2019 having been the deadline for that to happen. + +Change-Id: I54ea485736a4910254eeb21222ad263721cdef3c +Fixes: bz#1193929 +Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> + +Upstream-Status: Backport [https://review.gluster.org/#/c/glusterfs/+/23956/] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + cli/src/cli.c | 3 +++ + cli/src/cli.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +Index: glusterfs-11.1/cli/src/cli.c +=================================================================== +--- glusterfs-11.1.orig/cli/src/cli.c ++++ glusterfs-11.1/cli/src/cli.c +@@ -65,6 +65,9 @@ + + extern struct rpc_clnt_program cli_prog; + ++int cli_default_conn_timeout = 120; ++int cli_ten_minutes_timeout = 600; ++ + static int + glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx) + { diff --git a/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch b/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch new file mode 100644 index 00000000..d139ea28 --- /dev/null +++ b/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch @@ -0,0 +1,30 @@ +From 526b64958b8aabcbad48ffb61f6855b374a68da6 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 25 Jan 2024 18:08:01 +0000 +Subject: [PATCH] configure: pass SSL_CERTS. Don't discover it + +Executing the ssl binary to locate the certificates doesn't work +in our environment. Pass it to the build instead. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 1cda220..fe14134 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -814,6 +814,7 @@ AS_IF([test "x$enable_fuse_notifications" != "xno"], [ + dnl Find out OpenSSL trusted certificates path + AC_MSG_CHECKING([for OpenSSL trusted certificates path]) + SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|') ++SSL_CERT_PATH="${SSL_CERTS_DIR}" + if test -d "${SSL_CERT_PATH}" 1>/dev/null 2>&1; then + AC_MSG_RESULT([$SSL_CERT_PATH]) + AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.]) +-- +2.39.2 + diff --git a/recipes-extended/glusterfs/files/glusterd.service b/recipes-extended/glusterfs/files/glusterd.service index 4835c820..2219f582 100644 --- a/recipes-extended/glusterfs/files/glusterd.service +++ b/recipes-extended/glusterfs/files/glusterd.service @@ -4,9 +4,9 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=@localstatedir@/run/glusterd.pid +PIDFile=/run/glusterd.pid ExecStartPre=@base_bindir@/mkdir -p @localstatedir@/log/glusterfs -ExecStart=@SBINDIR@/glusterd -p @localstatedir@/run/glusterd.pid +ExecStart=@SBINDIR@/glusterd -p /run/glusterd.pid [Install] WantedBy=multi-user.target diff --git a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch index c8e0e7d7..7a72e9cb 100644 --- a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch +++ b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch @@ -24,19 +24,16 @@ Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> extras/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/extras/Makefile.am b/extras/Makefile.am -index ff5ca9b..1f59746 100644 ---- a/extras/Makefile.am -+++ b/extras/Makefile.am -@@ -10,7 +10,7 @@ endif +Index: glusterfs-11.1/extras/Makefile.am +=================================================================== +--- glusterfs-11.1.orig/extras/Makefile.am ++++ glusterfs-11.1/extras/Makefile.am +@@ -10,7 +10,7 @@ EditorModedir = $(docdir) EditorMode_DATA = glusterfs-mode.el glusterfs.vim -SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ +SUBDIRS = benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ - $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python + $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python \ + ganesha command-completion - confdir = $(sysconfdir)/glusterfs --- -2.8.1 - diff --git a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch index e8f99acc..9b807fee 100644 --- a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch +++ b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch @@ -26,24 +26,24 @@ Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> geo-replication/src/gsyncd.c | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) -diff --git a/configure.ac b/configure.ac -index bc4cf93..d55a7b2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -279,6 +279,8 @@ AC_CANONICAL_HOST +Index: glusterfs-11.1/configure.ac +=================================================================== +--- glusterfs-11.1.orig/configure.ac ++++ glusterfs-11.1/configure.ac +@@ -261,6 +261,8 @@ AC_PROG_CC AC_DISABLE_STATIC - AC_PROG_LIBTOOL + LT_INIT +AC_SUBST(TARGET_PYTHON) + AC_SUBST([shrext_cmds]) AC_CHECK_PROG([RPCGEN], [rpcgen], [yes], [no]) -diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am -index 9937a0b..07456fb 100644 ---- a/geo-replication/src/Makefile.am -+++ b/geo-replication/src/Makefile.am -@@ -22,7 +22,8 @@ noinst_HEADERS = procdiggy.h +Index: glusterfs-11.1/geo-replication/src/Makefile.am +=================================================================== +--- glusterfs-11.1.orig/geo-replication/src/Makefile.am ++++ glusterfs-11.1/geo-replication/src/Makefile.am +@@ -22,7 +22,8 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \ @@ -53,11 +53,11 @@ index 9937a0b..07456fb 100644 AM_CFLAGS = -Wall $(GF_CFLAGS) -diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c -index 77af662..8cd0551 100644 ---- a/geo-replication/src/gsyncd.c -+++ b/geo-replication/src/gsyncd.c -@@ -118,9 +118,9 @@ invoke_gsyncd(int argc, char **argv) +Index: glusterfs-11.1/geo-replication/src/gsyncd.c +=================================================================== +--- glusterfs-11.1.orig/geo-replication/src/gsyncd.c ++++ glusterfs-11.1/geo-replication/src/gsyncd.c +@@ -115,9 +115,9 @@ goto error; j = 0; @@ -69,7 +69,7 @@ index 77af662..8cd0551 100644 nargv[j++] = python; nargv[j++] = GSYNCD_PREFIX "/python/syncdaemon/" GSYNCD_PY; for (i = 1; i < argc; i++) -@@ -170,7 +170,7 @@ find_gsyncd(pid_t pid, pid_t ppid, char *name, void *data) +@@ -167,7 +167,7 @@ ret = 0; switch (zeros) { case 2: @@ -78,6 +78,3 @@ index 77af662..8cd0551 100644 strcmp(basename(buf + strlen(buf) + 1), GSYNCD_PY)) == 0) { ret = 1; break; --- -2.17.1 - diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc index a5677840..c5f21c70 100644 --- a/recipes-extended/glusterfs/glusterfs.inc +++ b/recipes-extended/glusterfs/glusterfs.inc @@ -19,18 +19,21 @@ SRC_URI += "file://glusterd.init \ file://libglusterfs-Don-t-link-against-libfl.patch \ file://glusterd-change-port-range.patch \ file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \ + file://0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch \ + file://0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch \ " -LICENSE = "(LGPLv3+ | GPLv2) & GPLv3+ & LGPLv3+ & GPLv2+ & LGPLv2+ & LGPLv2.1+ & Apache-2.0" +LICENSE = "(LGPL-3.0-or-later | GPL-2.0-only) & GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later & Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING-GPLV2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING-LGPLV3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://contrib/fuse-util/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit autotools pkgconfig distutils3-base update-rc.d systemd +inherit autotools pkgconfig setuptools3-base update-rc.d systemd inherit python3-dir +inherit bash-completion -DEPENDS += "bison-native flex-native python3-native fuse libaio libtirpc libxml2 ncurses \ - openssl python3 readline zlib liburcu util-linux glib-2.0 acl" +DEPENDS += "openssl-native bison-native flex-native python3-native fuse libaio libtirpc libxml2 ncurses \ + openssl python3 readline zlib liburcu util-linux glib-2.0 acl ca-certificates ca-certificates-native liburing" # rpc now comes from libtirpc instead of glibc # @@ -40,27 +43,31 @@ LDFLAGS += " -ltirpc" EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \ ac_cv_file__etc_SuSE_release=no \ ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_centos_release=no \ + ac_cv_file__etc_centos_release=no \ + ac_cv_file__etc_os_release=no \ --with-mountutildir=${sbindir} \ --disable-fusermount \ TARGET_PYTHON=${bindir}/python3 \ PYTHON=${PYTHON} \ + SSL_CERTS_DIR="${sysconfdir_native}/ssl/certs" \ BUILD_PYTHON_INC=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ BUILD_PYTHON_LIB=python${PYTHON_BASEVERSION} \ BUILD_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \ " -PACKAGECONFIG ??= "georeplication libibverbs" -PACKAGECONFIG_remove_mipsarch = "libibverbs" -PACKAGECONFIG_remove_arm = "libibverbs" +PACKAGECONFIG ??= "georeplication" PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync" -PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm," +# PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibverbs librdmacm," PACKAGECONFIG[ocf] = "--with-ocf,--without-ocf,," PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," +PACKAGECONFIG[tcmalloc] = ",--without-tcmalloc,," -do_install_append() { +# TODO: packageconfig for: +# --disable-linux-io_uring + +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/glusterd.init \ ${D}${sysconfdir}/init.d/glusterd @@ -107,29 +114,29 @@ INITSCRIPT_NAME = "glusterd" INITSCRIPT_PARAMS = "start 20 5 3 2 . stop 80 0 1 6 ." SYSTEMD_PACKAGES = "glusterfs-server" -SYSTEMD_SERVICE_${PN} = "glusterd.service" +SYSTEMD_SERVICE:${PN} = "glusterd.service" SYSTEMD_AUTO_ENABLE = "disable" # Allow plug-in symlinks. -INSANE_SKIP_${PN} += "dev-so" -INSANE_SKIP_${PN}-rdma += "dev-so" -INSANE_SKIP_${PN}-fuse += "dev-so" -INSANE_SKIP_${PN}-server += "dev-so" +INSANE_SKIP:${PN} += "dev-so" +INSANE_SKIP:${PN}-rdma += "dev-so" +INSANE_SKIP:${PN}-fuse += "dev-so" +INSANE_SKIP:${PN}-server += "dev-so" PACKAGES += "${PN}-rdma ${PN}-geo-replication ${PN}-fuse ${PN}-server \ ${PN}-api ${PN}-ocf" -RDEPENDS_${PN} += "python3-core python3-json python3-ctypes bash" -RDEPENDS_${PN}-ocf += "bash" -RDEPENDS_${PN}-server += "bash" -RDEPENDS_${PN}-geo-replication += "python3-core bash" +RDEPENDS:${PN} += "python3-core python3-json python3-ctypes bash" +RDEPENDS:${PN}-ocf += "bash" +RDEPENDS:${PN}-server += "bash" +RDEPENDS:${PN}-geo-replication += "python3-core bash" -FILES_${PN}-dbg += "${libdir}/glusterfs/${PV}/*/.debug \ +FILES:${PN}-dbg += "${libdir}/glusterfs/${PV}/*/.debug \ ${libdir}/glusterfs/${PV}/*/*/.debug \ ${libdir}/glusterfs/${PV}/*/*/*/.debug \ ${libexecdir}/glusterfs/.debug" -FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ +FILES:${PN} = "${libdir}/glusterfs/${PV}/auth \ ${libdir}/glusterfs/${PV}/rpc-transport/socket* \ ${libdir}/glusterfs/${PV}/xlator/cluster \ ${libdir}/glusterfs/${PV}/xlator/debug \ @@ -139,7 +146,7 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ ${libdir}/glusterfs/${PV}/xlator/protocol/client* \ ${libdir}/glusterfs/${PV}/xlator/system \ ${libdir}/glusterfs/${PV}/xlator/testing \ - ${libdir}/glusterfs/${PV}/xlator/playground \ + ${libdir}/glusterfs/${PV}/xlator/playground \ ${libdir}/glusterfs/${PV}/xlator/meta.so \ ${libdir}/glusterfs/ganesha \ ${libdir}/glusterfs/glusterfs/glusterfind \ @@ -152,7 +159,7 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ ${libdir}/libgfdb.so.* \ ${libdir}/libgfxdr.so.* \ ${libdir}/python*/site-packages \ - ${libexecdir}/glusterfs/gfevents \ + ${libexecdir}/glusterfs/gfevents \ ${libexecdir}/glusterfs/events \ ${libexecdir}/glusterfs/glusterfind \ ${libexecdir}/glusterfs/gfind_missing_files \ @@ -162,7 +169,10 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ ${libexecdir}/glusterfs/peer_mountbroker \ ${libexecdir}/glusterfs/peer_gsec_create \ ${libexecdir}/glusterfs/gverify.sh \ + ${libexecdir}/glusterfs/glfsheal \ + ${libexecdir}/glusterfs/scripts/ \ ${libexecdir}/glusterfs/peer_add_secret_pub \ + ${libexecdir}/ganesha/ \ ${localstatedir} \ ${sysconfdir}/default/volatiles \ ${sbindir}/glusterfs \ @@ -174,30 +184,31 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ ${sbindir}/glustereventsd \ ${sbindir}/gf_attach \ ${sbindir}/*.py \ - ${sbindir}/gluster-setgfid2path \ + ${sbindir}/gluster-setgfid2path \ ${bindir}/ \ ${sysconfdir}/glusterfs \ ${sysconfdir}/ganesha \ ${datadir}/glusterfs/* \ " -FILES_${PN}-rdma = "${libdir}/glusterfs/${PV}/rpc-transport/rdma*" +FILES:${PN}-rdma = "${libdir}/glusterfs/${PV}/rpc-transport/rdma*" -FILES_${PN}-geo-replication = "${libexecdir}/glusterfs/gsyncd \ +FILES:${PN}-geo-replication = "${libexecdir}/glusterfs/gsyncd \ ${libexecdir}/glusterfs/python/syncdaemon \ ${libexecdir}/glusterfs/peer_georep-sshkey.py \ ${libexecdir}/glusterfs/set_geo_rep_pem_keys.sh \ ${sbindir}/gluster-georep-sshkey" -FILES_${PN}-fuse = "${bindir}/fusermount-glusterfs \ +FILES:${PN}-fuse = "${bindir}/fusermount-glusterfs \ ${libdir}/glusterfs/${PV}/xlator/mount \ ${sbindir}/mount.glusterfs \ ${base_sbindir}/mount.glusterfs" -FILES_${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \ +FILES:${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \ ${libdir}/glusterfs/${PV}/xlator/nfs \ ${libdir}/glusterfs/${PV}/xlator/protocol/server* \ ${libdir}/glusterfs/${PV}/xlator/storage \ + ${libdir}/glusterfs/${PV}/cloudsync-plugins/ \ ${sbindir}/gluster \ ${sbindir}/glusterd \ ${sysconfdir}/glusterfs/glusterd.vol \ @@ -207,11 +218,11 @@ FILES_${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \ ${systemd_system_unitdir}" # Note: Debian package renaming produces libgfapi[0-9]+-*.*.rpm. -FILES_${PN}-api = "${libdir}/libgfapi.so.*" +FILES:${PN}-api = "${libdir}/libgfapi.so.*" -FILES_${PN}-ocf = "${prefix}/lib/ocf" +FILES:${PN}-ocf = "${prefix}/lib/ocf" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update fi diff --git a/recipes-extended/glusterfs/glusterfs_11.1.bb b/recipes-extended/glusterfs/glusterfs_11.1.bb new file mode 100644 index 00000000..224fe187 --- /dev/null +++ b/recipes-extended/glusterfs/glusterfs_11.1.bb @@ -0,0 +1,6 @@ +SRC_URI = "https://bits.gluster.org/pub/gluster/glusterfs/src/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "7e290a50026752f435f694651687e0f2" +SRC_URI[sha256sum] = "6a31b8450d02cd12f47f4571c031e9d6b8705279a0e8970ae9a05e1c87dffb76" + +require glusterfs.inc diff --git a/recipes-extended/glusterfs/glusterfs_6.1.bb b/recipes-extended/glusterfs/glusterfs_6.1.bb deleted file mode 100644 index e109c080..00000000 --- a/recipes-extended/glusterfs/glusterfs_6.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = "https://bits.gluster.org/pub/gluster/glusterfs/src/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "18967c357204d4cbdd9c1731508862c6" -SRC_URI[sha256sum] = "32ac75c883cdf18e081893ce5210b2331f1ee9ba25e3f3f56136d9878b194dc7" - -require glusterfs.inc diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb index edf92f01..edc7895f 100644 --- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb +++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb @@ -9,7 +9,7 @@ Also includes ACM (communication management assistant) service." HOMEPAGE = "http://www.openfabrics.org/downloads/rdmacm/" SECTION = "libs/devel" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause | GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=39cc3044d68741f9005da73e9b92db95" DEPENDS = "virtual/libibverbs" @@ -24,21 +24,21 @@ SRC_URI[sha256sum] = "8f10848d4810585d6d70b443abc876c1db8df5e9b8b07e095c7e6eaf4a inherit autotools # Allow plug-in symlinks. -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" PACKAGES += "${PN}-utils" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/rsocket/*.so*" -FILES_${PN}-utils = "${bindir}" -FILES_${PN}-staticdev += "${libdir}/rsocket/librspreload.a" -FILES_${PN}-dbg += "${libdir}/rsocket/.debug" +FILES:${PN} = "${libdir}/*.so.* ${libdir}/rsocket/*.so*" +FILES:${PN}-utils = "${bindir}" +FILES:${PN}-staticdev += "${libdir}/rsocket/librspreload.a" +FILES:${PN}-dbg += "${libdir}/rsocket/.debug" PACKAGECONFIG ??= "" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind," -do_install_append() { +do_install:append() { rm -f ${D}${libdir}/librdmacm.la rm -f ${D}${libdir}/rsocket/librspreload.la } -COMPATIBLE_HOST_mipsarch = "none" -COMPATIBLE_HOST_arm = "none" +COMPATIBLE_HOST:mipsarch = "none" +COMPATIBLE_HOST:arm = "none" diff --git a/recipes-support/celt051/celt051_git.bb b/recipes-support/celt051/celt051_git.bb index ee388214..52c7cf38 100644 --- a/recipes-support/celt051/celt051_git.bb +++ b/recipes-support/celt051/celt051_git.bb @@ -9,7 +9,7 @@ with high quality. Unlike these formats CELT imposes very little delay \ on the signal, even less than is typical for speech centric formats \ like Speex, GSM, or G.729." -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=375f60ab360d17f0172737036ff155b2" PV = "0.5.1.3" @@ -17,7 +17,7 @@ PR = "r0" SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" -SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https" +SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch b/recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch new file mode 100644 index 00000000..86e9f7b4 --- /dev/null +++ b/recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch @@ -0,0 +1,34 @@ +From fb9c5b955da462695e0a662aebfa13493eaf3978 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Fri, 13 Oct 2023 22:28:25 +0800 +Subject: [PATCH] utils/Makefile.am: fix shebang for chsh.py and getent.py + +Update shebang to python3 for chsh.py and getent.py to fix QA issue: + +WARNING: nss-pam-ldapd-0.9.12-r0 do_package_qa: QA Issue: File +/usr/share/nslcd-utils/chsh.py in package nss-pam-ldapd contains +reference to TMPDIR +File /usr/share/nslcd-utils/getent.py in package nss-pam-ldapd contains +reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + utils/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/Makefile.am b/utils/Makefile.am +index a6bccd3..22a50d8 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -39,5 +39,5 @@ install-data-hook: + set -ex; for cmd in getent chsh ; do \ + [ -L $(DESTDIR)$(bindir)/$$cmd.$(MODULE_NAME) ] || $(LN_S) $(utilsdir)/$$cmd.py $(DESTDIR)$(bindir)/$$cmd.$(MODULE_NAME) ; \ + chmod a+rx $(DESTDIR)$(utilsdir)/$$cmd.py ; \ +- sed -i -e '1 s|^#!.*|#! $(PYTHON)|;1 s|^#! \([^/].*\)|#! /usr/bin/env \1|' $(DESTDIR)$(utilsdir)/$$cmd.py ; \ ++ sed -i -e '1 s|/usr/bin/env python|/usr/bin/env python3|' $(DESTDIR)$(utilsdir)/$$cmd.py ; \ + done +-- +2.25.1 + diff --git a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb index 98fb4425..7f3b9e38 100644 --- a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb +++ b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb @@ -8,14 +8,15 @@ DESCRIPTION = "\ HOMEPAGE = "http://arthurdejong.org/nss-pam-ldapd/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SECTION = "base" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI = "\ http://arthurdejong.org/nss-pam-ldapd/${BPN}-${PV}.tar.gz \ + file://0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch \ file://nslcd.init \ file://nslcd.service \ " @@ -23,8 +24,8 @@ SRC_URI = "\ inherit autotools features_check REQUIRED_DISTRO_FEATURES = "pam" -SRC_URI[md5sum] = "8c99fdc54f4bf9aca8c5f53fdb1403ff" -SRC_URI[sha256sum] = "ef7362e7f2003da8c7beb7bcc03c30494acf712625aaac8badc6e7eb16f3453f" +SRC_URI[md5sum] = "cc30ee0ab91d6c94b7a343ae09b5dc69" +SRC_URI[sha256sum] = "c6d661e74693cbf531a790631ca93b73f291fb23cc39465b09deb8da2bfb0e14" DEPENDS += "libpam openldap krb5" @@ -34,14 +35,14 @@ EXTRA_OECONF = "\ --with-pam-seclib-dir=${base_libdir}/security \ " -CONFFILES_${PN} += "${sysconfdir}/nslcd.conf" +CONFFILES:${PN} += "${sysconfdir}/nslcd.conf" -FILES_${PN} += "${base_libdir}/security ${datadir}" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" +FILES:${PN} += "${base_libdir}/security ${datadir}" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" LDAP_DN ?= "dc=my-domain,dc=com" -do_install_append() { +do_install:append() { install -D -m 0755 ${WORKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd sed -i -e 's/^uid nslcd/# uid nslcd/;' ${D}${sysconfdir}/nslcd.conf @@ -57,4 +58,4 @@ inherit update-rc.d systemd INITSCRIPT_NAME = "nslcd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "nslcd.service" +SYSTEMD_SERVICE:${PN} = "nslcd.service" diff --git a/recipes-support/openldap/openldap_2.4.39.bb b/recipes-support/openldap/openldap_2.4.39.bb index 3048c8ee..1083e3e3 100644 --- a/recipes-support/openldap/openldap_2.4.39.bb +++ b/recipes-support/openldap/openldap_2.4.39.bb @@ -164,7 +164,7 @@ PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no," #--enable-mdb enable mdb database backend no|yes|mod no PACKAGECONFIG[mdb] = "--enable-mdb=mod,--enable-mdb=no," -CPPFLAGS_append = " -D_GNU_SOURCE" +CPPFLAGS:append = " -D_GNU_SOURCE" do_configure() { cp ${STAGING_DATADIR_NATIVE}/libtool/config/ltmain.sh ${S}/build @@ -177,6 +177,6 @@ do_configure() { oe_runconf } -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" -FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" +FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" +FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" diff --git a/recipes-support/puppet-vswitch/puppet-vswitch_git.bb b/recipes-support/puppet-vswitch/puppet-vswitch_git.bb index 86922aef..14c2dd7a 100644 --- a/recipes-support/puppet-vswitch/puppet-vswitch_git.bb +++ b/recipes-support/puppet-vswitch/puppet-vswitch_git.bb @@ -7,7 +7,7 @@ PV = "3.0.0" SRCREV = "c374840910c823f7669cf2e1229c7df7192ae880" SRC_URI = " \ - git://github.com/openstack/puppet-vswitch.git;branch=master \ + git://github.com/openstack/puppet-vswitch.git;branch=master;protocol=https \ file://Add-gemspec.patch \ " @@ -20,7 +20,7 @@ DEPENDS += " \ facter \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ facter \ puppet \ @@ -28,5 +28,5 @@ RDEPENDS_${PN} += " \ RUBY_INSTALL_GEMS = "puppet-vswitch-${PV}.gem" -do_install_append() { +do_install:append() { } diff --git a/recipes-support/puppet/puppet_5.4.0.bb b/recipes-support/puppet/puppet_5.4.0.bb index 54574e49..c207e40f 100644 --- a/recipes-support/puppet/puppet_5.4.0.bb +++ b/recipes-support/puppet/puppet_5.4.0.bb @@ -20,7 +20,7 @@ DEPENDS += " \ facter \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ facter \ ruby-shadow \ @@ -34,9 +34,9 @@ INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." SYSTEMD_AUTO_ENABLE = "enable" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/puppet install -d ${D}${sysconfdir}/puppet/manifests install -d ${D}${sysconfdir}/puppet/modules diff --git a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb index 2d3d9c2b..78ded052 100644 --- a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb +++ b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb @@ -7,7 +7,7 @@ PV = "4.10.0" SRCREV = "0b4822be3d2242e83c28ab7fed6c5817adc322d5" SRC_URI = " \ - git://github.com/puppetlabs/puppetlabs-stdlib.git;branch=master \ + git://github.com/puppetlabs/puppetlabs-stdlib.git;branch=master;protocol=https \ file://Add-gemspec.patch \ " @@ -20,7 +20,7 @@ DEPENDS += " \ facter \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ facter \ puppet \ diff --git a/recipes-support/ruby-shadow/ruby-shadow_git.bb b/recipes-support/ruby-shadow/ruby-shadow_git.bb index e7db6d16..0c6fc60b 100644 --- a/recipes-support/ruby-shadow/ruby-shadow_git.bb +++ b/recipes-support/ruby-shadow/ruby-shadow_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=137882914e5269b7268f0fe8e28a3f89" PV = "2.5.0" -SRC_URI = "git://github.com/apalmblad/ruby-shadow.git" +SRC_URI = "git://github.com/apalmblad/ruby-shadow.git;branch=master;protocol=https" SRCREV = "d2e822d8a8bda61f0774debbfce363a7347ed893" S = "${WORKDIR}/git" @@ -15,9 +15,9 @@ DEPENDS += " \ ruby \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ruby \ " RUBY_INSTALL_GEMS = "ruby-shadow-${PV}.gem" -FILES_${PN}-dbg += "/usr/lib*/ruby/gems/*/gems/ruby-shadow-${PV}/.debug/shadow.so" +FILES:${PN}-dbg += "/usr/lib*/ruby/gems/*/gems/ruby-shadow-${PV}/.debug/shadow.so" diff --git a/recipes-support/spice/spice_git.bb b/recipes-support/spice/spice_git.bb index 7198ce05..44e7ce15 100644 --- a/recipes-support/spice/spice_git.bb +++ b/recipes-support/spice/spice_git.bb @@ -10,7 +10,7 @@ environment - not only on its computer-server machine, but also from \ anywhere on the Internet and using a wide variety of machine \ architectures." -LICENSE = "BSD & LGPLv2.1+" +LICENSE = "BSD & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PR = "r0" @@ -26,9 +26,9 @@ SRCREV_spice-protocol = "784407f248e7f99d2bfcc9368f9acd1efb2b9617" SRCREV_FORMAT = "spice_spice-common_spice-protocol" -SRC_URI = "git://anongit.freedesktop.org/spice/spice;name=spice \ - git://anongit.freedesktop.org/spice/spice-common;destsuffix=git/spice-common;name=spice-common \ - git://anongit.freedesktop.org/spice/spice-protocol;destsuffix=git/spice-common/spice-protocol;name=spice-protocol \ +SRC_URI = "git://anongit.freedesktop.org/spice/spice;name=spice;branch=master \ + git://anongit.freedesktop.org/spice/spice-common;destsuffix=git/spice-common;name=spice-common;branch=master \ + git://anongit.freedesktop.org/spice/spice-protocol;destsuffix=git/spice-common/spice-protocol;name=spice-protocol;branch=master \ " SRC_URI += " \ @@ -62,15 +62,15 @@ PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,," PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama," PACKAGES =+ "${PN}-protocol" -LICENSE_${PN}-protocol = "BSD" -FILES_${PN}-protocol += "${includedir}/spice-1" -FILES_${PN}-protocol += "${datadir}/pkgconfig" +LICENSE:${PN}-protocol = "BSD" +FILES:${PN}-protocol += "${includedir}/spice-1" +FILES:${PN}-protocol += "${datadir}/pkgconfig" -do_configure_prepend() { +do_configure:prepend() { mkdir -p ${S}/spice-common/spice-protocol/m4 } -do_install_append() { +do_install:append() { cd ${B}/spice-common/spice-protocol oe_runmake DESTDIR="${D}" install cd - |