aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/layer.conf8
-rw-r--r--meta-openstack/Documentation/README.OpenLDAP2
-rw-r--r--meta-openstack/README.setup2
-rw-r--r--meta-openstack/conf/layer.conf2
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch53
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch25
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch25
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb60
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb49
-rw-r--r--meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinderclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-glanceclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-glancestore_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-heat_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-heatclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-horizon_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutronclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-novaclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-novnc_git.bb20
-rw-r--r--meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-openstackclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-os-client-config.inc2
-rw-r--r--meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python-rally_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-ryu_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-swift_git.bb2
-rwxr-xr-xmeta-openstack/recipes-devtools/python/python-trove_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-troveclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb1
-rw-r--r--meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-kafka_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-memcached_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch (renamed from meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch)4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-novnc_git.bb18
-rw-r--r--meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-os-brick_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-os-vif_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-os-win_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslotest_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-pycadf_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-salttesting_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-trollius_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb2
-rw-r--r--meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend (renamed from meta-openstack/recipes-devtools/qemu/qemu_5.%.bbappend)0
-rw-r--r--meta-openstack/recipes-devtools/ruby/bundler_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/chef-zero_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/coderay_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb (renamed from meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.6.bb)12
-rw-r--r--meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb (renamed from meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb)5
-rw-r--r--meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/erubis_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb4
-rw-r--r--meta-openstack/recipes-devtools/ruby/hashie_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/highline_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb (renamed from meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb)6
-rw-r--r--meta-openstack/recipes-devtools/ruby/ipaddress_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/json_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/ruby/method-source_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/mime-types_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb5
-rw-r--r--meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/net-ssh_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/ohai_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/pry_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/rack_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/rest-client_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb6
-rw-r--r--meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb6
-rw-r--r--meta-openstack/recipes-devtools/ruby/slop_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb (renamed from meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb)6
-rw-r--r--meta-openstack/recipes-devtools/ruby/systemu_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb6
-rw-r--r--meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb6
-rw-r--r--meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb6
-rw-r--r--meta-openstack/recipes-devtools/ruby/yard_git.bb2
-rw-r--r--meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb2
-rw-r--r--meta-openstack/recipes-extended/images/openstack-image-aio.bb2
-rw-r--r--meta-openstack/recipes-extended/images/openstack-image-compute.bb2
-rw-r--r--meta-openstack/recipes-extended/images/openstack-image-controller.bb2
-rw-r--r--meta-openstack/recipes-extended/libvirt/libvirt_9.%.bbappend (renamed from meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend)0
-rw-r--r--meta-openstack/recipes-extended/novnc/novnc_git.bb2
-rw-r--r--meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb2
-rw-r--r--meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb3
-rw-r--r--meta-openstack/recipes-extended/tempest/tempest_git.bb2
-rw-r--r--meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb2
-rw-r--r--meta-openstack/recipes-support/chef/chef_git.bb2
-rw-r--r--meta-openstack/recipes-support/iproute2/iproute2_6.%.bbappend (renamed from meta-openstack/recipes-support/iproute2/iproute2_5.%.bbappend)0
-rw-r--r--meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch37
-rw-r--r--meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb8
-rw-r--r--meta-openstack/recipes-support/salt/salt_3001.1.bb2
-rw-r--r--meta-openstack/recipes-support/spice-html5/spice-html5_git.bb4
-rw-r--r--meta-openstack/recipes-support/tgt/tgt_git.bb4
-rw-r--r--recipes-connectivity/consul/consul-migrate_git.bb16
-rw-r--r--recipes-connectivity/consul/consul_git.bb2
-rw-r--r--recipes-connectivity/serf/hashicorp-serf_0.8.5.bb2
-rw-r--r--recipes-devtools/python/python-ansible.inc10
-rw-r--r--recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch1483
-rw-r--r--recipes-devtools/python/python3-ansible_2.14.5.bb (renamed from recipes-devtools/python/python3-ansible_2.3.1.0.bb)6
-rw-r--r--recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch28
-rw-r--r--recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch30
-rw-r--r--recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch17
-rw-r--r--recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch37
-rw-r--r--recipes-extended/glusterfs/glusterfs.inc34
-rw-r--r--recipes-extended/glusterfs/glusterfs_11.1.bb6
-rw-r--r--recipes-extended/glusterfs/glusterfs_6.1.bb6
-rw-r--r--recipes-extended/librdmacm/librdmacm_1.1.0.bb2
-rw-r--r--recipes-support/celt051/celt051_git.bb2
-rw-r--r--recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch34
-rw-r--r--recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb (renamed from recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb)7
-rw-r--r--recipes-support/puppet-vswitch/puppet-vswitch_git.bb2
-rw-r--r--recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb2
-rw-r--r--recipes-support/ruby-shadow/ruby-shadow_git.bb2
-rw-r--r--recipes-support/spice/spice_git.bb8
166 files changed, 1079 insertions, 1300 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 4f71854d..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 = "honister"
-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/Documentation/README.OpenLDAP b/meta-openstack/Documentation/README.OpenLDAP
index a45b7691..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.setup b/meta-openstack/README.setup
index d1a47034..f837f635 100644
--- a/meta-openstack/README.setup
+++ b/meta-openstack/README.setup
@@ -95,7 +95,7 @@ systemd will be used in your images:
Additionally activiate the meta-virtualization layer:
- DISTRO_FEATURES:append += "virtualization kvm"
+ DISTRO_FEATURES:append = " virtualization kvm"
Package configurations
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index bd5a8ac7..24768809 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 = "honister"
+LAYERSERIES_COMPAT_openstack-layer = "nanbield"
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/open-iscsi-user_2.1.4.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
deleted file mode 100644
index 58e58988..00000000
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
+++ /dev/null
@@ -1,60 +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 autotools 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 \
- file://0001-fix-build-error-of-cross-build.patch \
- "
-
-SRCREV = "095f59ca464220eae285de6b5f2ee31185a6a84c"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'"
-
-do_configure () {
- :
-}
-
-do_compile () {
- oe_runmake user
-}
-
-do_install () {
- oe_runmake DESTDIR="${D}" install_user
- install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi
- install -m 0644 ${S}/etc/iscsid.conf ${D}/etc/iscsi/
-
- install -d ${D}${libdir}
- install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/
- ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libopeniscsiusr.so
-}
-
-# systemd support
-PACKAGES =+ "${PN}-systemd"
-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.service \
- iscsiuio.service \
- iscsid.service \
- iscsi-init.service \
- iscsid.socket \
- iscsiuio.socket "
-
-do_install:append () {
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${S}/etc/systemd/* ${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-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-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index 85ab146a..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 2d6d708b..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index e72d7216..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index e8d6ffc7..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 \
"
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index a9537ce1..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index acfc6e71..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 \
"
diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb
index e769bbd3..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"
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 0f2f1949..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
index db6fd60a..0c153805 100644
--- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
@@ -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"
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 9e36656c..4eedeadc 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -78,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 \
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 cd86952f..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"
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index e533fcd0..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 59738341..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index 090f963a..42993e67 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -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 \
"
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 77e7b82b..7afe347d 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -13,7 +13,7 @@ SRCNAME = "nova"
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 \
"
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 9f0ac5c9..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 \
"
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-oauthlib_0.7.2.bb b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
index b6741afe..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"
diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb
index b90f4968..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}"
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 356845aa..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"
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-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb
index 063a2b99..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
index 83fc88cd..8b4fa84a 100644
--- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb
@@ -8,7 +8,7 @@ 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"
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 675a1850..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 \
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index 7e6b6f61..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 \
"
diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb
index 9955f2e9..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}"
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 218d92b4..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,7 +1,7 @@
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"
+LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1702a92c723f09e3fab3583b165a8d90"
PR = "r1"
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
index 449063f0..9ef1d8fa 100644
--- a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb
@@ -11,5 +11,4 @@ inherit setuptools3 pypi
RDEPENDS:${PN} += " \
${PYTHON_PN}-dateutil \
- ${PYTHON_PN}-backports-functools-lru-cache \
"
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 f92f979c..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
@@ -3,7 +3,7 @@ SUMMARY = "Python bindings for the avahi zeroconf client"
HOMEPAGE = "https://github.com/lathiat/avahi"
SECTION = "devel/python"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz"
diff --git a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
index 53f1ed98..7a0fc81e 100644
--- a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e031cff4528978748f9cc064c6e6fa73"
SRC_URI = "\
- git://github.com/openstack/python-barbicanclient.git \
+ git://github.com/openstack/python-barbicanclient.git;branch=master;protocol=https \
"
PV = "5.0.1+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
index 65e1bbdc..e216c8b0 100644
--- a/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
@@ -1,7 +1,7 @@
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] = "6ac3af37693e0f517e51593d9ea33f23"
diff --git a/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
index 6cd0d810..a9335317 100644
--- a/meta-openstack/recipes-devtools/python/python3-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} \
diff --git a/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb
index 8439daaf..a6dee5ca 100644
--- a/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb
@@ -18,6 +18,6 @@ DEPENDS += " \
python3-pbr-native \
"
-RDPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
python3-pbr \
"
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
index 2706954a..bb236eb8 100644
--- a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e7e54827196088e6e96b33e9aec35c4a"
SRC_URI[md5sum] = "f88353e40dec06410acfa075b8209b27"
SRC_URI[sha256sum] = "4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DEPENDS += " \
python3-pip \
diff --git a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
index b40e39c8..24b3220a 100644
--- a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb
@@ -9,7 +9,7 @@ SRCREV = "5bb126bf20bbb5baeb4e9afc48008dbe411631bc"
SRCNAME = "kafka-python"
LIC_FILES_CHKSUM = "file://LICENSE;md5=22efebb1e053dcc946f4b9d17f3cbbea"
-SRC_URI = "git://github.com/mumrah/${SRCNAME}.git"
+SRC_URI = "git://github.com/mumrah/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
index 7511de34..689cb0da 100644
--- a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb
@@ -9,7 +9,7 @@ SRCNAME = "keystoneclient"
SRC_URI = "file://keystone-api-check.sh"
SRC_URI = "\
- git://github.com/openstack/python-keystoneclient.git;branch=stable/pike \
+ git://github.com/openstack/python-keystoneclient.git;branch=stable/pike;protocol=https \
file://keystone-api-check.sh \
"
diff --git a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
index 81e1f22b..ba446380 100644
--- a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72"
SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9"
SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DEPENDS += "\
python3-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
index 4e6f40ea..aaa5d686 100644
--- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
@@ -5,13 +5,13 @@ DESCRIPTION = "\
memcached servers. Search google for memcached for more information."
HOMEPAGE = "https://pypi.python.org/pypi/python-memcached/"
SECTION = "devel/python"
-LICENSE = "PSF"
+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"
+SRC_URI = "git://github.com/linsomniac/python-memcached.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
index 3cf8b73d..0860aae6 100644
--- a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb
@@ -5,7 +5,7 @@ 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 = "1.0.1+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
index da87dfdb..ae7bd430 100644
--- a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
@@ -9,7 +9,7 @@ PYPI_PACKAGE = "python-mimeparse"
SRC_URI[md5sum] = "a32ae1df93be1ddb581d1c0fa124bab4"
SRC_URI[sha256sum] = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78"
-inherit distutils3 pypi setuptools3
+inherit pypi setuptools3
DISTUTILS_INSTALL_ARGS = "--root=${D} \
--prefix=${prefix} \
diff --git a/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
index 2127ccf3..765c9b08 100644
--- a/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
@@ -4,7 +4,7 @@
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] = "072f72e782f28a9c42356976f8ec22d9"
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-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
index 3a78fb9e..5e5035d4 100644
--- a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
SRC_URI = " \
- git://github.com/openstack/python-openstacksdk.git;branch=master \
+ git://github.com/openstack/python-openstacksdk.git;branch=master;protocol=https \
"
PV = "0.52.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
index c52526ac..093b673e 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
SRC_URI = "\
- git://github.com/openstack/os-brick.git;branch=stable/victoria \
+ git://github.com/openstack/os-brick.git;branch=stable/victoria;protocol=https \
"
SRCREV = "f0cf77672fed70f20896c23015cb50341f311f38"
diff --git a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
index 82e53b14..a8fe3c01 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
SRC_URI = "\
- git://github.com/openstack/os-vif.git \
+ git://github.com/openstack/os-vif.git;branch=master;protocol=https \
"
PV = "2.2.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
index bbbd96c0..b8a23fbd 100644
--- a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
SRC_URI = "\
- git://github.com/openstack/os-win.git \
+ git://github.com/openstack/os-win.git;branch=master;protocol=https \
"
PV = "5.1.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
index 8b087b28..5ce82ed5 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb
@@ -8,7 +8,7 @@ PV = "2.6.1+git${SRCPV}"
SRCREV = "df075b2465195de53e42897e7d9be6c6c375ce5e"
SRCNAME = "oslo.cache"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
index 04178c24..abcff6ba 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "oslo.concurrency library"
HOMEPAGE = "http://launchpad.net/oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb
index 9a0caa80..2aa318fb 100644
--- a/meta-openstack/recipes-devtools/python/python3-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"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
index ed5a2fc0..0a5a05dc 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb
@@ -8,7 +8,7 @@ PV = "8.4.0+git${SRCPV}"
SRCREV = "e42c73343f640eaacb0a76d204eb55c85de4f5d5"
SRCNAME = "oslo.db"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
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 59a5a0a1..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,14 +1,14 @@
DESCRIPTION = "oslo.i18n library"
HOMEPAGE = "http://launchpad.net/oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
inherit setuptools3
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
index 6536478f..c702e5ca 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb
@@ -5,7 +5,7 @@ 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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
PV = "3.30.3+git${SRCPV}"
SRCREV = "76d1dee7b80c62172ea3900b75a47edf5b64cab4"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
index 4f201fef..0dc65bed 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
SRCNAME = "oslo.messaging"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
PV = "12.5.0+git${SRCPV}"
SRCREV = "62e104bdb57714a0754f788795d1b4faf8ebb74d"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
index 090a3650..51b3e7c2 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "Oslo Middleware library"
HOMEPAGE = "http://launchpad.net/oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
index fac6ba98..e5674328 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
@@ -2,14 +2,14 @@ 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"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
index 46f95c00..f6e51021 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
SRCNAME = "oslo.privsep"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
PV = "2.4.0+git${SRCPV}"
SRCREV = "512b5d9f6b79b798474d8bb2dac2462b0f705cb9"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
index 2706df00..1b9e4930 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "oslo.reports library"
HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
index 5e3bb7cc..b873afdb 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "Oslo Rootwrap"
HOMEPAGE = "https://launchpad.net/oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb
index 3935026b..542404a9 100644
--- a/meta-openstack/recipes-devtools/python/python3-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"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
index c2f6702c..7ea4373f 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "oslo.service library"
HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
S = "${WORKDIR}/git"
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 7036bd03..7bec9804 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb
@@ -5,7 +5,7 @@ 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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https"
PV = "3.28.0+git${SRCPV}"
SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
index e3bfc53f..b24158e3 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "oslo.versionedobjects library"
HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+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"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
index 6f060be8..e748a1f5 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb
@@ -8,7 +8,7 @@ PV = "3.4.0+git${SRCPV}"
SRCREV = "32c8d43a20cb6a29f03324fbc2e6cad3bfb5a294"
SRCNAME = "oslo.vmware"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
index 04f6d490..c4416505 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb
@@ -10,7 +10,7 @@ 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"
diff --git a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
index bdd05030..b5de2621 100644
--- a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb
@@ -5,7 +5,7 @@ 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.4+git${SRCPV}"
SRCREV = "40064ca2d99389f278028508a17f2e38d6df6f10"
diff --git a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
index b243a4ab..4f9618d4 100644
--- a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb
@@ -8,7 +8,7 @@ PV = "3.1.0+git${SRCPV}"
SRCREV = "2402013a8719873d65136fc283e1855166adbc26"
SRCNAME = "pycadf"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git"
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
index 09b10036..d338a9e4 100644
--- a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
@@ -1,7 +1,7 @@
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] = "1b03ad2853e33d47eea698571255247c"
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
index 929fb500..644c3de7 100644
--- 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
@@ -1,7 +1,7 @@
DESCRIPTION = "API for Linux kernel SCSI target (aka LIO)"
HOMEPAGE = "http://github.com/agrover/rtslib-fb"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cf391b108961d84a581f45259ec47c52"
SRC_URI[md5sum] = "85ab011e3a98fb585d8a0fb337c5dab4"
diff --git a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
index c75ef5d6..7dfd0f82 100644
--- a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb
@@ -22,7 +22,7 @@ SRCNAME = "saharaclient"
inherit setuptools3
-SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master"
+SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master;protocol=https"
PV = "3.2.1+git${SRCPV}"
SRCREV = "a9fee07108c432e20a3ca7760541d4fcb4f14811"
diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
index d146730c..51cf18ec 100644
--- a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb
@@ -4,7 +4,7 @@ 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 \
+SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop;protocol=https \
file://0001-Add-ptest-output-option-to-test-suite.patch \
"
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 5cff8eeb..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,7 +1,7 @@
DESCRIPTION = "Lightweight SOAP client (Jurko's fork)"
HOMEPAGE = "https://bitbucket.org/jurko/suds"
SECTION = "devel/python"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=847e96bce86d8774f491a92924343a29"
PYPI_PACKAGE_EXT = "tar.bz2"
diff --git a/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
index a8d50097..127287a7 100644
--- a/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d"
SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df"
SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DEPENDS += " \
python3-pip \
diff --git a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
index 8df1948c..12941baa 100644
--- a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb
@@ -8,7 +8,7 @@ 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"
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 6c09b948..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,7 +1,7 @@
DESCRIPTION = "Build self-validating python objects using JSON schemas"
HOMEPAGE = "http://github.com/bcwaldon/warlock"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
DEPENDS += "python3-jsonschema python3-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 fd2c918d..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,7 +1,7 @@
DESCRIPTION = "A WeakMethod class for storing bound methods using weak references."
HOMEPAGE = "https://github.com/twang817/weakrefmethod"
SECTION = "devel/python"
-LICENSE = "PSF"
+LICENSE = "PSF-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
SRC_URI[md5sum] = "39e7450191dea0b17a646b929784ac6f"
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
index 40b694e1..84e3f72b 100644
--- a/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "WebSockets support for any application/server"
HOMEPAGE = "https://github.com/kanaka/websockify"
SECTION = "devel/python"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://PKG-INFO;md5=eb81922f483833198eace60f1469f99d"
SRC_URI[md5sum] = "ff745fd67457fd077915753c9b808b2a"
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
index 2094d62c..3c21c791 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
@@ -1,7 +1,7 @@
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"
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
index a853f2c5..6c45bc3e 100644
--- 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
@@ -1,7 +1,7 @@
DESCRIPTION = "%DESCRIPTION%"
HOMEPAGE = "%URL%"
SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7de5500e6244db6d698bbb724aea9a17"
PYPI_PACKAGE = "XStatic-jquery-ui"
diff --git a/meta-openstack/recipes-devtools/qemu/qemu_5.%.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend
index 025ee4ee..025ee4ee 100644
--- a/meta-openstack/recipes-devtools/qemu/qemu_5.%.bbappend
+++ b/meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend
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 993e2926..199fd41e 100644
--- a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
@@ -21,7 +21,7 @@ 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
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 540231a9..16fd5429 100644
--- a/meta-openstack/recipes-devtools/ruby/erubis_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/erubis_git.bb
@@ -16,7 +16,7 @@ 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
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 71b0533e..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,7 +3,9 @@ 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"
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 6bf809ed..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"
@@ -20,3 +22,5 @@ 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 017c6c73..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/ipaddress-gem/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 f7b3dd79..61655e5a 100644
--- a/meta-openstack/recipes-devtools/ruby/json_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/json_git.bb
@@ -4,7 +4,7 @@
SUMMARY = "An implementation of the JSON specification according to RFC 4627"
DESCRIPTION = "An implementation of the JSON specification according to RFC 4627"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://CHANGES;md5=af8cad0ff27a1593ac5ee461bc2d71ab"
PR = "r0"
@@ -16,7 +16,7 @@ SRCREV = "4cf6c6270f52888997ec1b626b9f557db4f26f2e"
S = "${WORKDIR}/git"
SRC_URI = " \
- git://github.com/flori/json.git;branch=v1.8 \
+ 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 c34b74bc..d10835d9 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
@@ -17,7 +17,7 @@ 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
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 21fe4064..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,7 +20,7 @@ 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 \
"
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 965eae1e..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,7 +20,7 @@ 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 \
"
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 ee5c7351..f7bad071 100644
--- a/meta-openstack/recipes-devtools/ruby/ohai_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
@@ -20,7 +20,7 @@ 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
diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb
index 3480cdc9..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 \
"
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 0837a3b3..706af39c 100644
--- a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
@@ -18,7 +18,7 @@ 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
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 516a72eb..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"
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 53a2f8a0..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"
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 2f7bc66a..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"
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 e7a25b1f..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;branch=main \
+ git://github.com/lsegal/yard.git;branch=main;protocol=https \
"
inherit ruby
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 63f8e03b..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"
diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb
index 858c8e99..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 15726fde..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 7f41a086..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/libvirt/libvirt_6.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_9.%.bbappend
index 025ee4ee..025ee4ee 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend
+++ b/meta-openstack/recipes-extended/libvirt/libvirt_9.%.bbappend
diff --git a/meta-openstack/recipes-extended/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb
index 19802c91..82dcd4b3 100644
--- a/meta-openstack/recipes-extended/novnc/novnc_git.bb
+++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b428e7772bf00c07fb7b863b80358adf"
SRCREV = "9142f8f0f7b4a53447f5cfec3a797cbf0d6204a9"
PV = "1.2.0+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"
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
index 9308d893..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
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/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index ed5c4048..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 \
"
diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
index f6559f97..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 \
"
diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb
index 8a325846..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 \
"
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/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 fbb46d31..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,18 +9,18 @@ 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"
diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
index fbd58558..4a77fb81 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -18,7 +18,7 @@ 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 \
+SRC_URI = "https://files.pythonhosted.org/packages/source/s/${BPN}/${BPN}-${PV}.tar.gz \
"
SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9"
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 2006e1f9..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,7 +19,7 @@ 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"
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index d74de4ef..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 \
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 828a20ec..0d084b0d 100644
--- a/recipes-connectivity/consul/consul_git.bb
+++ b/recipes-connectivity/consul/consul_git.bb
@@ -5,7 +5,7 @@ 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;branch=main \
+SRC_URI = "git://${GO_IMPORT}.git;branch=main;protocol=https \
file://0001-Migration-Rename-imports-throughout.patch \
file://consul.service \
"
diff --git a/recipes-connectivity/serf/hashicorp-serf_0.8.5.bb b/recipes-connectivity/serf/hashicorp-serf_0.8.5.bb
index 7e2a7617..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"
diff --git a/recipes-devtools/python/python-ansible.inc b/recipes-devtools/python/python-ansible.inc
index 2b8d655e..fa55ba3f 100644
--- a/recipes-devtools/python/python-ansible.inc
+++ b/recipes-devtools/python/python-ansible.inc
@@ -1,18 +1,16 @@
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"
+LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
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.14"
-SRC_URI[md5sum] = "b1be8f05864a07c06b8a767dcd48ba1b"
-SRC_URI[sha256sum] = "cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5"
+SRCREV = "5c6dfff68759ccc9794b609db45872950077e98b"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${WORKDIR}/git"
ANSIBLE_WHITELIST_MODULES ?= "commands files system network/ovs __pycache__ service"
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..67a4f954 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,799 +1,651 @@
-From 66b824da2fadfd5760040be244f89fa8320df55b Mon Sep 17 00:00:00 2001
+From b5d7b08addeb7795720acf3debd88a13ddd30402 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.24.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 +-
+ docs/bin/find-plugin-refs.py | 2 +-
+ docs/docsite/rst/dev_guide/testing/sanity/shebang.rst | 2 +-
+ docs/docsite/rst/inventory_guide/connection_details.rst | 4 ++--
+ docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po | 4 ++--
+ examples/scripts/uptime.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/build-ansible.py | 2 +-
+ hacking/create_deprecation_bug_reports.py | 2 +-
+ hacking/fix_test_syntax.py | 2 +-
+ hacking/get_library.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/release.py | 2 +-
+ packaging/sdist/check-link-behavior.py | 2 +-
+ .../targets/ansible-galaxy-collection/files/build_bad_tar.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/group/files/gidget.py | 2 +-
+ test/integration/targets/module_utils/module_utils/foo.py | 2 +-
+ test/integration/targets/module_utils/module_utils/sub/bam.py | 2 +-
+ .../targets/module_utils/module_utils/sub/bam/bam.py | 2 +-
+ .../targets/module_utils/module_utils/sub/bar/bam.py | 2 +-
+ .../targets/module_utils/module_utils/sub/bar/bar.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/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 ++--
+ 71 files changed, 75 insertions(+), 75 deletions(-)
-diff --git a/bin/ansible b/bin/ansible
-index 24550b9..0587499 100755
---- a/bin/ansible
-+++ b/bin/ansible
+diff --git a/.azure-pipelines/scripts/combine-coverage.py b/.azure-pipelines/scripts/combine-coverage.py
+index 506ade6460c..15bee402341 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-connection b/bin/ansible-connection
-index 93d787e..f0b9aa3 100755
---- a/bin/ansible-connection
-+++ b/bin/ansible-connection
+ """
+ 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 f2bc4b84b38..01ad32f494c 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) 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
+ """
+ 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 5e8eb8d4c8f..5450c48900e 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-doc b/bin/ansible-doc
-index 24550b9..0587499 100755
---- a/bin/ansible-doc
-+++ b/bin/ansible-doc
+ from __future__ import (absolute_import, division, print_function)
+diff --git a/docs/bin/find-plugin-refs.py b/docs/bin/find-plugin-refs.py
+index d603409d688..c52d6d13e38 100755
+--- a/docs/bin/find-plugin-refs.py
++++ b/docs/bin/find-plugin-refs.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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
+ # To run this script, first make webdocs in the toplevel of the checkout. This will generate all
+ # rst files from their sources. Then run this script ./docs/bin/find-plugin-refs.py
+diff --git a/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst b/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst
+index cff2aa0914b..7c4bd651563 100644
+--- a/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst
++++ b/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst
+@@ -6,7 +6,7 @@ Most executable files should only use one of the following shebangs:
+ - ``#!/bin/sh``
+ - ``#!/bin/bash``
+ - ``#!/usr/bin/make``
+-- ``#!/usr/bin/env python``
++- ``#!/usr/bin/env python3``
+ - ``#!/usr/bin/env bash``
- # (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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
+ NOTE: For ``#!/bin/bash``, any of the options ``eux`` may also be used, such as ``#!/bin/bash -eux``.
+diff --git a/docs/docsite/rst/inventory_guide/connection_details.rst b/docs/docsite/rst/inventory_guide/connection_details.rst
+index 5e332160617..65bfd5903ad 100644
+--- a/docs/docsite/rst/inventory_guide/connection_details.rst
++++ b/docs/docsite/rst/inventory_guide/connection_details.rst
+@@ -84,13 +84,13 @@ You can run commands against the control node by using "localhost" or "127.0.0.1
- # (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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
+ .. code-block:: bash
- # (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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
+- $ ansible localhost -m ping -e 'ansible_python_interpreter="/usr/bin/env python"'
++ $ ansible localhost -m ping -e 'ansible_python_interpreter="/usr/bin/env python3"'
- # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
- #
-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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
+ You can specify localhost explicitly by adding this to your inventory file:
- '''
-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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
+ .. code-block:: bash
- # (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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # Copyright 2016 Doalitic.
- #
- # 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
+- localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python"
++ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python3"
+
+ .. _host_key_checking_on:
+
+diff --git a/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po b/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po
+index b6abc3e5874..53f5fdc8986 100644
+--- a/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po
++++ b/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po
+@@ -11820,8 +11820,8 @@ msgid "``#!/usr/bin/make``"
+ msgstr "``#!/usr/bin/make``"
+
+ #: ../../rst/dev_guide/testing/sanity/shebang.rst:9
+-msgid "``#!/usr/bin/env python``"
+-msgstr "``#!/usr/bin/env python``"
++msgid "``#!/usr/bin/env python3``"
++msgstr "``#!/usr/bin/env python3``"
+
+ #: ../../rst/dev_guide/testing/sanity/shebang.rst:10
+ msgid "``#!/usr/bin/env bash``"
+diff --git a/examples/scripts/uptime.py b/examples/scripts/uptime.py
+index d77a5fb5660..665594c254b 100755
+--- a/examples/scripts/uptime.py
++++ b/examples/scripts/uptime.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
+
+ from __future__ import (absolute_import, division, print_function)
+ __metaclass__ = type
+diff --git a/hacking/ansible-profile b/hacking/ansible-profile
+index 6612402da62..d67526a1619 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
- """
- 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/azp/download.py b/hacking/azp/download.py
+index 117e9da5b7a..89466cb17be 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
- """
- 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
+ # (c) 2016 Red Hat, Inc.
+diff --git a/hacking/azp/get_recent_coverage_runs.py b/hacking/azp/get_recent_coverage_runs.py
+index 25e2fa8120a..9b0d9b972ed 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) 2020 Red Hat, Inc.
#
- # (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/azp/incidental.py b/hacking/azp/incidental.py
+index 87d4d213c94..7660e2ed226 100755
+--- a/hacking/azp/incidental.py
++++ b/hacking/azp/incidental.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+ # PYTHON_ARGCOMPLETE_OK
- '''
- 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) 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
+ # (c) 2020 Red Hat, Inc.
+diff --git a/hacking/azp/run.py b/hacking/azp/run.py
+index 00a177944f8..591e6bcc4fe 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
- '''
- 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
+ # (c) 2016 Red Hat, Inc.
+diff --git a/hacking/backport/backport_of_line_adder.py b/hacking/backport/backport_of_line_adder.py
+index ef77ddcf400..bbec15de6a2 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
- """
- 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
+ # (c) 2020, Red Hat, Inc. <relrod@redhat.com>
+ #
+ # This file is part of Ansible
+diff --git a/hacking/build-ansible.py b/hacking/build-ansible.py
+index c108c1861fa..8ebb88d33bd 100755
+--- a/hacking/build-ansible.py
++++ b/hacking/build-ansible.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
+ # coding: utf-8
+ # PYTHON_ARGCOMPLETE_OK
+ # Copyright: (c) 2019, Ansible Project
+diff --git a/hacking/create_deprecation_bug_reports.py b/hacking/create_deprecation_bug_reports.py
+index e14df4be389..e6b9b9025c3 100755
+--- a/hacking/create_deprecation_bug_reports.py
++++ b/hacking/create_deprecation_bug_reports.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+ # PYTHON_ARGCOMPLETE_OK
+ """Create GitHub issues for deprecated features."""
- 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/hacking/fix_test_syntax.py b/hacking/fix_test_syntax.py
+index 7178033406a..78d87ef71cb 100755
+--- a/hacking/fix_test_syntax.py
++++ b/hacking/fix_test_syntax.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # Copyright 2013 Google Inc.
+ # -*- coding: utf-8 -*-
+ # (c) 2017, Matt Martz <matt@sivel.net>
#
- # 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
+diff --git a/hacking/get_library.py b/hacking/get_library.py
+index 23bf4a39bb5..9346784398f 100755
+--- a/hacking/get_library.py
++++ b/hacking/get_library.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- # (c) 2013, Michael Scherer <misc@zarb.org>
+ # (c) 2014, Will Thames <will@thames.id.au>
#
-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
+diff --git a/hacking/report.py b/hacking/report.py
+index 58b3a6b915a..78eed516dc0 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."""
- # (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
+diff --git a/hacking/return_skeleton_generator.py b/hacking/return_skeleton_generator.py
+index 7002b7899d5..cff03c38e6b 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) 2013, Michael Scherer <misc@zarb.org>
+ # (c) 2017, Will Thames <will@thames.id.au>
#
-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
+diff --git a/hacking/test-module.py b/hacking/test-module.py
+index 54343e07e8b..38d4b8c60bb 100755
+--- a/hacking/test-module.py
++++ b/hacking/test-module.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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
+ # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
#
- # (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
+diff --git a/hacking/tests/gen_distribution_version_testcase.py b/hacking/tests/gen_distribution_version_testcase.py
+index 2fc5a2f9328..18e67d7d121 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
- # (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
+ """
+ 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 747f058880a..2570ab2c7d3 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."""
- # (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
+diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py
+index e90b44ce101..120948c7495 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
-
- # (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) 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 3a5c24214b1..98d7a732517 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) 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
+ # 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 3125cc47a7f..4a2f38bb48e 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
-
- '''
- 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
+ # 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 9f560bcbc6d..a0d34d92f6d 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/openstack.py b/contrib/inventory/openstack.py
-index 6679a2c..eb38742 100755
---- a/contrib/inventory/openstack.py
-+++ b/contrib/inventory/openstack.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 c280380c18c..0357401c749 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
-
- # 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
+ # 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 e8ed75e4636..e4bb334932e 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
- # -*- 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
+ # 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 9c091a675a9..27ff7d442e4 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
- # 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
+ # (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 dc8f055b44d..0e5b030eecf 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
- # -*- 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
+ # 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 9109137e7f8..f01b1ec58dc 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
-
- '''
- 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) 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 3e60329de60..69499407479 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
-
- # 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
+ # (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/release.py b/packaging/release.py
+index 1d1ba37117a..a561dc6a905 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."""
- 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
+diff --git a/packaging/sdist/check-link-behavior.py b/packaging/sdist/check-link-behavior.py
+index 34e05023d48..42f6c4be98f 100755
+--- a/packaging/sdist/check-link-behavior.py
++++ b/packaging/sdist/check-link-behavior.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+ """Checks for link behavior required for sdist to retain symlinks."""
- # (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
+ from __future__ import (absolute_import, division, print_function)
+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 6182e865db0..5829df52b5b 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
- # -*- 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
+
+ # 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-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py
+index 687128056f7..bd7f3671655 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."""
- # 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
+ 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 8effb647fca..4e34c4bbc16 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) 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
+ 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 463915284b2..fc2ed398d9f 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
- """
- SoftLayer external inventory script.
+ """Run a command using a PTY."""
-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
+ 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 a2b094e2fca..355dba697a9 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."""
- """
- 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
-@@ -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 4265cc3e6c1..e5a0d9b4834 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
-
- # (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
+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 4265cc3e6c1..e5a0d9b4834 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
+diff --git a/test/integration/targets/ansible-test/venv-pythons.py b/test/integration/targets/ansible-test/venv-pythons.py
+index b380f147fca..e97f2fcb33d 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."""
- # 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
+ import os
+diff --git a/test/integration/targets/ansible-vault/faux-editor.py b/test/integration/targets/ansible-vault/faux-editor.py
+index b67c7475631..a30c306a831 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
- """
- 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 1b7f02beb23..0dcada23c7e 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 ee46188742d..48244fca09e 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
+
+ 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 93958fc2adb..33509c826a3 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
- # 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)
+ __metaclass__ = type
+diff --git a/test/integration/targets/cli/test-cli.py b/test/integration/targets/cli/test-cli.py
+index 9893d6652ed..7a07dcc108e 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)
- '''
- 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
+diff --git a/test/integration/targets/cli/test_k_and_K.py b/test/integration/targets/cli/test_k_and_K.py
+index f7077fba0ab..dcc96141295 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) 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
+ # Make coding more python3-ish
+diff --git a/test/integration/targets/collection/update-ignore.py b/test/integration/targets/collection/update-ignore.py
+index 92a702cf13e..9ea69089d58 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."""
- # (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
+ import os
+diff --git a/test/integration/targets/debugger/test_run_once.py b/test/integration/targets/debugger/test_run_once.py
+index 237f9c2d903..4fe74903d8d 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
- 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
+ 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 463915284b2..fc2ed398d9f 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
- # (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
+ """Run a command using a PTY."""
+
+ import sys
+diff --git a/test/integration/targets/gathering/uuid.fact b/test/integration/targets/gathering/uuid.fact
+index 79e3f62677e..2a294b33a82 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
# -*- 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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # (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
+diff --git a/test/integration/targets/gathering_facts/uuid.fact b/test/integration/targets/gathering_facts/uuid.fact
+index 79e3f62677e..2a294b33a82 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
- """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/group/files/gidget.py b/test/integration/targets/group/files/gidget.py
+index 4b771516fdd..085dfcdee11 100644
+--- a/test/integration/targets/group/files/gidget.py
++++ b/test/integration/targets/group/files/gidget.py
+@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
- print('{"changed":false, "msg":"this is the embedded module"}')
+ from __future__ import (absolute_import, division, print_function)
+ __metaclass__ = type
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
+index 20698f1f463..0cd5c851429 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 @@
@@ -802,7 +654,7 @@ index 20698f1..0cd5c85 100644
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 566f8b7c47f..0814485d5fe 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 +663,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 b7ed707211e..97f9eedcdb7 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 @@
@@ -820,7 +672,7 @@ index b7ed707..97f9eed 100644
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
+index 02fafd40f3f..3a93360c69e 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 @@
@@ -829,7 +681,7 @@ index 02fafd4..3a93360 100644
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
+index 8566901f044..40f0c9446c9 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 @@
@@ -837,396 +689,135 @@ index 8566901..40f0c94 100644
+#!/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
-@@ -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
+diff --git a/test/integration/targets/pause/test-pause.py b/test/integration/targets/pause/test-pause.py
+index 3703470d065..dd14b2810d6 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/runner b/test/runner/injector/runner
-index 57241c9..c463946 100755
---- a/test/runner/injector/runner
-+++ b/test/runner/injector/runner
+ 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 aaf21875ca2..2835719e4f2 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/runner2 b/test/runner/injector/runner2
-index 57241c9..c463946 100755
---- a/test/runner/injector/runner2
-+++ b/test/runner/injector/runner2
+ 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 522493fcc77..b3aaf7f6b43 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/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
-@@ -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
-@@ -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
-@@ -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
-@@ -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/service_facts/files/ansible_test_service.py b/test/integration/targets/service_facts/files/ansible_test_service.py
+index 19f1e291388..609218325d6 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/retry.py b/test/runner/retry.py
-index 4972131..a9ffb07 100755
---- a/test/runner/retry.py
-+++ b/test/runner/retry.py
+ # 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 b0a8889439a..90c83b582b4 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
- # 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
+ from __future__ import (absolute_import, division, print_function)
+ __metaclass__ = type
+diff --git a/test/integration/targets/throttle/test_throttle.py b/test/integration/targets/throttle/test_throttle.py
+index 1a5bdd30789..344bcf0f868 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 fc31688be2e..f964bbe8d6d 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 79ff6c03ae3..730c87d3fc1 100644
+--- a/test/lib/ansible_test/_internal/util_common.py
++++ b/test/lib/ansible_test/_internal/util_common.py
+@@ -271,7 +271,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 b0b13197839..9535c3b4819 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 930654fc1e7..bbf50369d7d 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 fa6add8cd61..fcfd096e546 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):
+@@ -132,8 +132,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.14.5.bb
index ea0fdbe5..f3ab2377 100644
--- a/recipes-devtools/python/python3-ansible_2.3.1.0.bb
+++ b/recipes-devtools/python/python3-ansible_2.14.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
index 79a55b33..1cdccf99 100644
--- 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
@@ -72,11 +72,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
cli/src/cli.h | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
-diff --git a/cli/src/cli.c b/cli/src/cli.c
-index cb425c84b..2c96b7ae6 100644
---- a/cli/src/cli.c
-+++ b/cli/src/cli.c
-@@ -84,6 +84,9 @@ rpc_clnt_prog_t *cli_rpc_prog;
+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;
@@ -86,21 +86,3 @@ index cb425c84b..2c96b7ae6 100644
static int
glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx)
{
-diff --git a/cli/src/cli.h b/cli/src/cli.h
-index 81f75a0b4..cd4db3dac 100644
---- a/cli/src/cli.h
-+++ b/cli/src/cli.h
-@@ -40,8 +40,8 @@ enum argp_option_keys {
- ARGP_PORT_KEY = 'p',
- };
-
--int cli_default_conn_timeout;
--int cli_ten_minutes_timeout;
-+extern int cli_default_conn_timeout;
-+extern int cli_ten_minutes_timeout;
-
- typedef enum {
- COLD_BRICK_COUNT,
---
-2.21.0
-
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/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 646b521f..c5f21c70 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -20,18 +20,20 @@ SRC_URI += "file://glusterd.init \
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
#
@@ -41,25 +43,29 @@ 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,,"
+
+# TODO: packageconfig for:
+# --disable-linux-io_uring
do_install:append() {
install -d ${D}${sysconfdir}/init.d
@@ -140,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 \
@@ -153,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 \
@@ -163,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 \
@@ -175,7 +184,7 @@ FILES:${PN} = "${libdir}/glusterfs/${PV}/auth \
${sbindir}/glustereventsd \
${sbindir}/gf_attach \
${sbindir}/*.py \
- ${sbindir}/gluster-setgfid2path \
+ ${sbindir}/gluster-setgfid2path \
${bindir}/ \
${sysconfdir}/glusterfs \
${sysconfdir}/ganesha \
@@ -199,6 +208,7 @@ 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 \
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 2e18b0a9..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"
diff --git a/recipes-support/celt051/celt051_git.bb b/recipes-support/celt051/celt051_git.bb
index 6eab5669..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"
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 0c73ccb0..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,7 +8,7 @@ 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"
@@ -16,6 +16,7 @@ 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"
diff --git a/recipes-support/puppet-vswitch/puppet-vswitch_git.bb b/recipes-support/puppet-vswitch/puppet-vswitch_git.bb
index 322d5e06..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 \
"
diff --git a/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb b/recipes-support/puppetlabs-stdlib/puppetlabs-stdlib_git.bb
index 5952578b..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 \
"
diff --git a/recipes-support/ruby-shadow/ruby-shadow_git.bb b/recipes-support/ruby-shadow/ruby-shadow_git.bb
index a49a4587..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"
diff --git a/recipes-support/spice/spice_git.bb b/recipes-support/spice/spice_git.bb
index e1fe16db..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 += " \