diff options
34 files changed, 686 insertions, 1085 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 805e1ade..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 = "kirkstone" -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/conf/layer.conf b/meta-openstack/conf/layer.conf index b112030f..b035adf7 100644 --- a/meta-openstack/conf/layer.conf +++ b/meta-openstack/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "openstack-layer" BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_openstack-layer = "5" -LAYERSERIES_COMPAT_openstack-layer = "kirkstone" +LAYERSERIES_COMPAT_openstack-layer = "scarthgap" BB_DANGLINGAPPENDS_WARNONLY ?= "true" LAYERDEPENDS_openstack-layer = " \ 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 index 8cedff46..1f84508f 100644 --- 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 @@ -44,12 +44,6 @@ FILES:${PN} += " \ ${systemd_unitdir}/system-generators/ibft-rule-generator \ " -do_install:append() { - rm -rf ${D}${systemd_unitdir}/ - - install -d ${D}${systemd_unitdir}/system - install -d ${D}${systemd_unitdir}/system-generators - install -m 0644 ${S}/etc/systemd/*.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/etc/systemd/*.socket ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/etc/systemd/ibft-rule-generator ${D}${systemd_unitdir}/system-generators/ +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/python/python-psycopg2_2.7.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb index d054214b..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 @@ -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/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-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb index 093b673e..cef666d4 100644 --- a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb @@ -40,3 +40,4 @@ RDEPENDS:${PN} += " \ python3-retrying \ python3-six \ python3-os-win \ +" 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/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/fluentd_1.9.2.bb b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb index 94d1ec80..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};branch=master" +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/http-parser.rb_0.6.0.bb b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb index 296b8dda..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;branch=master" +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/msgpack_1.3.3.bb b/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb index f40d6cfe..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};branch=master" +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/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 2f6b8d5a..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;branch=master" +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/strptime_0.2.3.bb b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb index 7167d9ab..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;branch=master" +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/tzinfo-data_1.2019.3.bb b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb index 6b1d01ce..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;branch=master" +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 07680d7d..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;branch=master" +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 a0635e3a..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;branch=master" +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-extended/libvirt/libvirt_6.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend +++ b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend diff --git a/meta-openstack/recipes-extended/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-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/recipes-connectivity/consul/consul-migrate_git.bb b/recipes-connectivity/consul/consul-migrate_git.bb index 7d784c2a..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;branch=master" +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;branch=master;protocol=https \ - git://github.com/armon/go-metrics;name=go-metrics;destsuffix=git/src/github.com/armon/go-metrics;branch=master;protocol=https \ - git://github.com/hashicorp/raft-boltdb;name=raft-boltdb;destsuffix=git/src/github.com/hashicorp/raft-boltdb;branch=master;protocol=https \ - git://github.com/hashicorp/raft-mdb;name=raft-mdb;destsuffix=git/src/github.com/hashicorp/raft-mdb;branch=master;protocol=https \ - git://github.com/armon/gomdb;name=gomdb;destsuffix=git/src/github.com/armon/gomdb;branch=master;protocol=https \ - git://github.com/boltdb/bolt;name=bolt;destsuffix=git/src/github.com/boltdb/bolt;branch=master;protocol=https \ - git://github.com/hashicorp/go-msgpack;name=go-msgpack;destsuffix=git/src/github.com/hashicorp/go-msgpack;branch=master;protocol=https \ + 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-devtools/python/python-ansible.inc b/recipes-devtools/python/python-ansible.inc index 0bb663ae..7c9d0f51 100644 --- a/recipes-devtools/python/python-ansible.inc +++ b/recipes-devtools/python/python-ansible.inc @@ -2,17 +2,15 @@ DESCRIPTION = "Ansible is a simple IT automation platform that makes your applic HOMEPAGE = "https://github.com/ansible/ansible/" SECTION = "devel/python" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRCNAME = "ansible" -SRC_URI = "http://releases.ansible.com/ansible/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "git://github.com/ansible/ansible.git;protocol=https;branch=stable-2.16" -SRC_URI[md5sum] = "b1be8f05864a07c06b8a767dcd48ba1b" -SRC_URI[sha256sum] = "cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5" +SRCREV = "ee04df4796af1a438bc80aff33cdd5ca4d5304aa" - -S = "${WORKDIR}/${SRCNAME}-${PV}" +S = "${WORKDIR}/git" ANSIBLE_WHITELIST_MODULES ?= "commands files system network/ovs __pycache__ service" diff --git a/recipes-devtools/python/python3-ansible-collections_9.4.0.bb b/recipes-devtools/python/python3-ansible-collections_9.4.0.bb new file mode 100644 index 00000000..94f1af05 --- /dev/null +++ b/recipes-devtools/python/python3-ansible-collections_9.4.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Curated set of Ansible collections included in addition to ansible-core" +DESCRIPTION = "Ansible is a radically simple model-driven configuration management, \ +multi-node deployment, and remote task execution system. Ansible works \ +over SSH and does not require any software or daemons to be installed \ +on remote nodes. Extension modules can be written in any language and \ +are transferred to managed machines automatically. \ +This package provides a curated set of Ansible collections included in addition \ +to ansible-core." +HOMEPAGE = "https://pypi.org/project/ansible/" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +PYPI_PACKAGE = "ansible" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "dd431c63380e18c3faca3288ebde8ce2f4f992363ab558a3c11c8f2032d90867" + +RDEPENDS:${PN} = " \ + bash \ + python3-ansible \ +" diff --git a/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch b/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch index e98eb46c..420324b7 100644 --- a/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch +++ b/recipes-devtools/python/python3-ansible/python3-ensure-py-scripts-use-py3-for-shebang.patch @@ -1,808 +1,557 @@ -From 66b824da2fadfd5760040be244f89fa8320df55b Mon Sep 17 00:00:00 2001 +From f14f3a89262e9348348f6aeced9c20067a613062 Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Thu, 13 Jul 2017 14:11:46 -0400 +Date: Thu, 11 May 2023 17:05:54 +0800 Subject: [PATCH] python3: ensure py scripts use py3 for shebang +Upstream-Status: Pending + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +Rebase to 2.14.5 +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +Rebase to 2.16.5 +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- - bin/ansible | 2 +- - bin/ansible-connection | 2 +- - bin/ansible-console | 2 +- - bin/ansible-doc | 2 +- - bin/ansible-galaxy | 2 +- - bin/ansible-playbook | 2 +- - bin/ansible-pull | 2 +- - bin/ansible-vault | 2 +- - contrib/inventory/abiquo.py | 2 +- - contrib/inventory/apache-libcloud.py | 2 +- - contrib/inventory/apstra_aos.py | 2 +- - contrib/inventory/azure_rm.py | 2 +- - contrib/inventory/brook.py | 2 +- - contrib/inventory/cloudforms.py | 2 +- - contrib/inventory/cloudstack.py | 2 +- - contrib/inventory/cobbler.py | 2 +- - contrib/inventory/collins.py | 2 +- - contrib/inventory/consul_io.py | 2 +- - contrib/inventory/digital_ocean.py | 2 +- - contrib/inventory/docker.py | 2 +- - contrib/inventory/ec2.py | 2 +- - contrib/inventory/fleet.py | 2 +- - contrib/inventory/foreman.py | 2 +- - contrib/inventory/freeipa.py | 2 +- - contrib/inventory/gce.py | 2 +- - contrib/inventory/jail.py | 2 +- - contrib/inventory/landscape.py | 2 +- - contrib/inventory/libvirt_lxc.py | 2 +- - contrib/inventory/linode.py | 2 +- - contrib/inventory/lxc_inventory.py | 2 +- - contrib/inventory/mdt_dynamic_inventory.py | 2 +- - contrib/inventory/nagios_livestatus.py | 2 +- - contrib/inventory/nagios_ndo.py | 2 +- - contrib/inventory/nova.py | 2 +- - contrib/inventory/nsot.py | 2 +- - contrib/inventory/openshift.py | 2 +- - contrib/inventory/openstack.py | 2 +- - contrib/inventory/openvz.py | 2 +- - contrib/inventory/ovirt.py | 2 +- - contrib/inventory/ovirt4.py | 2 +- - contrib/inventory/packet_net.py | 2 +- - contrib/inventory/proxmox.py | 2 +- - contrib/inventory/rackhd.py | 2 +- - contrib/inventory/rax.py | 2 +- - contrib/inventory/rhv.py | 2 +- - contrib/inventory/rudder.py | 2 +- - contrib/inventory/serf.py | 2 +- - contrib/inventory/softlayer.py | 2 +- - contrib/inventory/spacewalk.py | 2 +- - contrib/inventory/ssh_config.py | 2 +- - contrib/inventory/stacki.py | 2 +- - contrib/inventory/vagrant.py | 2 +- - contrib/inventory/vbox.py | 2 +- - contrib/inventory/vmware.py | 2 +- - contrib/inventory/vmware_inventory.py | 2 +- - contrib/inventory/windows_azure.py | 2 +- - contrib/inventory/zabbix.py | 2 +- - contrib/inventory/zone.py | 2 +- - docs/docsite/rst/dev_guide/developing_api.rst | 2 +- - hacking/dump_playbook_attributes.py | 2 +- - hacking/module_formatter.py | 2 +- - lib/ansible/modules/web_infrastructure/django_manage.py | 2 +- - lib/ansible/modules/windows/win_file_version.py | 2 +- - lib/ansible/modules/windows/win_firewall_rule.py | 2 +- - test/compile/compile.py | 2 +- - test/integration/cleanup_rax.py | 2 +- - .../targets/embedded_module/library/test_integration_module | 2 +- - test/integration/targets/module_utils/module_utils/foo.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bam.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bam/bam.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bar/bam.py | 2 +- - test/integration/targets/module_utils/module_utils/sub/bar/bar.py | 2 +- - test/integration/targets/service/files/ansible_test_service | 2 +- - test/runner/ansible-test | 2 +- - test/runner/injector/ansible | 2 +- - test/runner/injector/ansible-console | 2 +- - test/runner/injector/ansible-doc | 2 +- - test/runner/injector/ansible-galaxy | 2 +- - test/runner/injector/ansible-playbook | 2 +- - test/runner/injector/ansible-pull | 2 +- - test/runner/injector/ansible-vault | 2 +- - test/runner/injector/cover | 2 +- - test/runner/injector/cover2 | 2 +- - test/runner/injector/cover2.4 | 2 +- - test/runner/injector/cover2.6 | 2 +- - test/runner/injector/cover2.7 | 2 +- - test/runner/injector/cover3 | 2 +- - test/runner/injector/cover3.5 | 2 +- - test/runner/injector/cover3.6 | 2 +- - test/runner/injector/injector.py | 2 +- - test/runner/injector/pytest | 2 +- - test/runner/injector/runner | 2 +- - test/runner/injector/runner2 | 2 +- - test/runner/injector/runner2.4 | 2 +- - test/runner/injector/runner2.6 | 2 +- - test/runner/injector/runner2.7 | 2 +- - test/runner/injector/runner3 | 2 +- - test/runner/injector/runner3.5 | 2 +- - test/runner/injector/runner3.6 | 2 +- - test/runner/retry.py | 2 +- - test/runner/test.py | 2 +- - test/sanity/code-smell/ansible-var-precedence-check.py | 2 +- - test/sanity/code-smell/integration-aliases.py | 2 +- - test/sanity/code-smell/shebang.sh | 4 ++-- - test/sanity/validate-modules/test_validate_modules_regex.py | 2 +- - test/sanity/validate-modules/validate-modules | 2 +- - test/units/executor/module_common/test_module_common.py | 4 ++-- - test/units/modules/network/nxos/test_nxos_config.py | 2 +- - test/utils/shippable/ansible-core-ci | 2 +- - test/utils/shippable/download.py | 2 +- - 121 files changed, 123 insertions(+), 123 deletions(-) + .azure-pipelines/scripts/combine-coverage.py | 2 +- + .azure-pipelines/scripts/publish-codecov.py | 2 +- + .azure-pipelines/scripts/time-command.py | 2 +- + hacking/ansible-profile | 2 +- + hacking/azp/download.py | 2 +- + hacking/azp/get_recent_coverage_runs.py | 2 +- + hacking/azp/incidental.py | 2 +- + hacking/azp/run.py | 2 +- + hacking/backport/backport_of_line_adder.py | 2 +- + hacking/create-bulk-issues.py | 2 +- + hacking/report.py | 2 +- + hacking/return_skeleton_generator.py | 2 +- + hacking/test-module.py | 2 +- + hacking/tests/gen_distribution_version_testcase.py | 2 +- + hacking/update-sanity-requirements.py | 2 +- + lib/ansible/cli/adhoc.py | 2 +- + lib/ansible/cli/config.py | 2 +- + lib/ansible/cli/console.py | 2 +- + lib/ansible/cli/doc.py | 2 +- + lib/ansible/cli/galaxy.py | 2 +- + lib/ansible/cli/inventory.py | 2 +- + lib/ansible/cli/playbook.py | 2 +- + lib/ansible/cli/pull.py | 2 +- + lib/ansible/cli/scripts/ansible_connection_cli_stub.py | 2 +- + lib/ansible/cli/vault.py | 2 +- + packaging/cli-doc/build.py | 2 +- + packaging/release.py | 2 +- + test/integration/targets/ansible-config/files/ini_dupes.py | 2 +- + .../targets/ansible-galaxy-collection/files/build_bad_tar.py | 2 +- + .../targets/ansible-galaxy-role/files/create-role-archive.py | 2 +- + test/integration/targets/ansible-test-container/runme.py | 2 +- + .../targets/ansible-test-integration-targets/test.py | 2 +- + .../ansible_collections/ns/col/run-with-pty.py | 2 +- + .../ns/col/tests/integration/targets/no-tty/assert-no-tty.py | 2 +- + .../ansible_collections/ns/col/scripts/env_python.py | 2 +- + .../ns/col/tests/integration/targets/valid/env_python.py | 2 +- + test/integration/targets/ansible-test/venv-pythons.py | 2 +- + test/integration/targets/ansible-vault/faux-editor.py | 2 +- + test/integration/targets/ansible-vault/password-script.py | 2 +- + test/integration/targets/ansible-vault/test-vault-client.py | 2 +- + .../targets/builtin_vars_prompt/test-vars_prompt.py | 2 +- + test/integration/targets/cli/test-cli.py | 2 +- + test/integration/targets/cli/test_k_and_K.py | 2 +- + test/integration/targets/collection/update-ignore.py | 2 +- + test/integration/targets/debugger/test_run_once.py | 2 +- + test/integration/targets/fork_safe_stdio/run-with-pty.py | 2 +- + test/integration/targets/gathering/uuid.fact | 2 +- + test/integration/targets/gathering_facts/uuid.fact | 2 +- + test/integration/targets/module_utils/module_utils/sub/bam.py | 2 +- + .../targets/module_utils/module_utils/sub/bam/bam.py | 2 +- + test/integration/targets/packaging_cli-doc/verify.py | 2 +- + test/integration/targets/pause/test-pause.py | 2 +- + test/integration/targets/pip/files/setup.py | 2 +- + .../integration/targets/service/files/ansible_test_service.py | 2 +- + .../targets/service_facts/files/ansible_test_service.py | 2 +- + .../targets/template/role_filter/filter_plugins/myplugin.py | 2 +- + test/integration/targets/test_utils/scripts/timeout.py | 2 +- + test/integration/targets/throttle/test_throttle.py | 2 +- + .../targets/var_precedence/ansible-var-precedence-check.py | 2 +- + test/lib/ansible_test/_internal/util_common.py | 2 +- + .../_util/controller/sanity/code-smell/shebang.py | 4 ++-- + .../ansible_test/_util/target/cli/ansible_test_cli_stub.py | 2 +- + test/units/executor/module_common/test_module_common.py | 4 ++-- + 63 files changed, 65 insertions(+), 65 deletions(-) -diff --git a/bin/ansible b/bin/ansible -index 24550b9..0587499 100755 ---- a/bin/ansible -+++ b/bin/ansible -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-connection b/bin/ansible-connection -index 93d787e..f0b9aa3 100755 ---- a/bin/ansible-connection -+++ b/bin/ansible-connection -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # (c) 2016, Ansible, Inc. <support@ansible.com> - # -diff --git a/bin/ansible-console b/bin/ansible-console -index 24550b9..0587499 100755 ---- a/bin/ansible-console -+++ b/bin/ansible-console +diff --git a/.azure-pipelines/scripts/combine-coverage.py b/.azure-pipelines/scripts/combine-coverage.py +index 506ade6460..15bee40234 100755 +--- a/.azure-pipelines/scripts/combine-coverage.py ++++ b/.azure-pipelines/scripts/combine-coverage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-doc b/bin/ansible-doc -index 24550b9..0587499 100755 ---- a/bin/ansible-doc -+++ b/bin/ansible-doc + """ + Combine coverage data from multiple jobs, keeping the data only from the most recent attempt from each job. + Coverage artifacts must be named using the format: "Coverage $(System.JobAttempt) {StableUniqueNameForEachJob}" +diff --git a/.azure-pipelines/scripts/publish-codecov.py b/.azure-pipelines/scripts/publish-codecov.py +index f2bc4b84b3..01ad32f494 100755 +--- a/.azure-pipelines/scripts/publish-codecov.py ++++ b/.azure-pipelines/scripts/publish-codecov.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-galaxy b/bin/ansible-galaxy -index 24550b9..0587499 100755 ---- a/bin/ansible-galaxy -+++ b/bin/ansible-galaxy + """ + Upload code coverage reports to codecov.io. + Multiple coverage files from multiple languages are accepted and aggregated after upload. +diff --git a/.azure-pipelines/scripts/time-command.py b/.azure-pipelines/scripts/time-command.py +index 5e8eb8d4c8..5450c48900 100755 +--- a/.azure-pipelines/scripts/time-command.py ++++ b/.azure-pipelines/scripts/time-command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Prepends a relative timestamp to each input line from stdin and writes it to stdout.""" - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-playbook b/bin/ansible-playbook -index 24550b9..0587499 100755 ---- a/bin/ansible-playbook -+++ b/bin/ansible-playbook + from __future__ import (absolute_import, division, print_function) +diff --git a/hacking/ansible-profile b/hacking/ansible-profile +index 9856e7ab5c..0988bb2037 100755 +--- a/hacking/ansible-profile ++++ b/hacking/ansible-profile @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-pull b/bin/ansible-pull -index 24550b9..0587499 100755 ---- a/bin/ansible-pull -+++ b/bin/ansible-pull +diff --git a/hacking/azp/download.py b/hacking/azp/download.py +index e0de99a27a..6ccd51b2aa 100755 +--- a/hacking/azp/download.py ++++ b/hacking/azp/download.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> - # -diff --git a/bin/ansible-vault b/bin/ansible-vault -index 24550b9..0587499 100755 ---- a/bin/ansible-vault -+++ b/bin/ansible-vault + # (c) 2016 Red Hat, Inc. +diff --git a/hacking/azp/get_recent_coverage_runs.py b/hacking/azp/get_recent_coverage_runs.py +index 1be867da1e..2fb1cc4582 100755 +--- a/hacking/azp/get_recent_coverage_runs.py ++++ b/hacking/azp/get_recent_coverage_runs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # (c) 2020 Red Hat, Inc. # -diff --git a/contrib/inventory/abiquo.py b/contrib/inventory/abiquo.py -index 405bbbb..d318949 100755 ---- a/contrib/inventory/abiquo.py -+++ b/contrib/inventory/abiquo.py +diff --git a/hacking/azp/incidental.py b/hacking/azp/incidental.py +index 87d4d213c9..7660e2ed22 100755 +--- a/hacking/azp/incidental.py ++++ b/hacking/azp/incidental.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- + # PYTHON_ARGCOMPLETE_OK - ''' -diff --git a/contrib/inventory/apache-libcloud.py b/contrib/inventory/apache-libcloud.py -index 0120d2b..ce92843 100755 ---- a/contrib/inventory/apache-libcloud.py -+++ b/contrib/inventory/apache-libcloud.py + # (c) 2020 Red Hat, Inc. +diff --git a/hacking/azp/run.py b/hacking/azp/run.py +index 00a177944f..591e6bcc4f 100755 +--- a/hacking/azp/run.py ++++ b/hacking/azp/run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK - # (c) 2013, Sebastien Goasguen <runseb@gmail.com> - # -diff --git a/contrib/inventory/apstra_aos.py b/contrib/inventory/apstra_aos.py -index 65838c0..48d293e 100755 ---- a/contrib/inventory/apstra_aos.py -+++ b/contrib/inventory/apstra_aos.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # (c) 2017 Apstra Inc, <community@apstra.com> - # -diff --git a/contrib/inventory/azure_rm.py b/contrib/inventory/azure_rm.py -index 73b8b95..87b31b0 100755 ---- a/contrib/inventory/azure_rm.py -+++ b/contrib/inventory/azure_rm.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (c) 2016 Matt Davis, <mdavis@ansible.com> - # Chris Houseknecht, <house@redhat.com> -diff --git a/contrib/inventory/brook.py b/contrib/inventory/brook.py -index a7d4741..e4de982 100755 ---- a/contrib/inventory/brook.py -+++ b/contrib/inventory/brook.py + # (c) 2016 Red Hat, Inc. +diff --git a/hacking/backport/backport_of_line_adder.py b/hacking/backport/backport_of_line_adder.py +index ef77ddcf40..bbec15de6a 100755 +--- a/hacking/backport/backport_of_line_adder.py ++++ b/hacking/backport/backport_of_line_adder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # Copyright 2016 Doalitic. + # (c) 2020, Red Hat, Inc. <relrod@redhat.com> # # This file is part of Ansible -diff --git a/contrib/inventory/cloudforms.py b/contrib/inventory/cloudforms.py -index 69c149b..202a6c9 100755 ---- a/contrib/inventory/cloudforms.py -+++ b/contrib/inventory/cloudforms.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # vim: set fileencoding=utf-8 : - # - # Copyright (C) 2016 Guido Günther <agx@sigxcpu.org> -diff --git a/contrib/inventory/cloudstack.py b/contrib/inventory/cloudstack.py -index a9b6b9f..d7f05ff 100755 ---- a/contrib/inventory/cloudstack.py -+++ b/contrib/inventory/cloudstack.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # (c) 2015, René Moser <mail@renemoser.net> -diff --git a/contrib/inventory/cobbler.py b/contrib/inventory/cobbler.py -index 89f9bf7..f2a9ff7 100755 ---- a/contrib/inventory/cobbler.py -+++ b/contrib/inventory/cobbler.py +diff --git a/hacking/create-bulk-issues.py b/hacking/create-bulk-issues.py +index d2651415df..2235daa5ec 100755 +--- a/hacking/create-bulk-issues.py ++++ b/hacking/create-bulk-issues.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Create GitHub issues for deprecated features.""" - """ - Cobbler external inventory script -diff --git a/contrib/inventory/collins.py b/contrib/inventory/collins.py -index b7193e2..f0bc2a1 100755 ---- a/contrib/inventory/collins.py -+++ b/contrib/inventory/collins.py +diff --git a/hacking/report.py b/hacking/report.py +index 58b3a6b915..78eed516dc 100755 +--- a/hacking/report.py ++++ b/hacking/report.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """A tool to aggregate data about Ansible source and testing into a sqlite DB for reporting.""" - """ - Collins external inventory script -diff --git a/contrib/inventory/consul_io.py b/contrib/inventory/consul_io.py -index 8106097..2cdc523 100755 ---- a/contrib/inventory/consul_io.py -+++ b/contrib/inventory/consul_io.py +diff --git a/hacking/return_skeleton_generator.py b/hacking/return_skeleton_generator.py +index 7002b7899d..cff03c38e6 100755 +--- a/hacking/return_skeleton_generator.py ++++ b/hacking/return_skeleton_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # (c) 2017, Will Thames <will@thames.id.au> # - # (c) 2015, Steve Gargan <steve.gargan@gmail.com> -diff --git a/contrib/inventory/digital_ocean.py b/contrib/inventory/digital_ocean.py -index 07c124b..0b0e587 100755 ---- a/contrib/inventory/digital_ocean.py -+++ b/contrib/inventory/digital_ocean.py +diff --git a/hacking/test-module.py b/hacking/test-module.py +index 7a329b4b2d..a1118ba144 100755 +--- a/hacking/test-module.py ++++ b/hacking/test-module.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - DigitalOcean external inventory script -diff --git a/contrib/inventory/docker.py b/contrib/inventory/docker.py -index da051dd..9b88d0c 100755 ---- a/contrib/inventory/docker.py -+++ b/contrib/inventory/docker.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 + # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> # - # (c) 2016 Paul Durivage <paul.durivage@gmail.com> - # Chris Houseknecht <house@redhat.com> -diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py -index 03b9820..9c9b2e4 100755 ---- a/contrib/inventory/ec2.py -+++ b/contrib/inventory/ec2.py +diff --git a/hacking/tests/gen_distribution_version_testcase.py b/hacking/tests/gen_distribution_version_testcase.py +index e75c78ad91..1613b02ed5 100755 +--- a/hacking/tests/gen_distribution_version_testcase.py ++++ b/hacking/tests/gen_distribution_version_testcase.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - EC2 external inventory script -diff --git a/contrib/inventory/fleet.py b/contrib/inventory/fleet.py -index 4db4ea1..8790f2b 100755 ---- a/contrib/inventory/fleet.py -+++ b/contrib/inventory/fleet.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 """ - fleetctl base external inventory script. Automatically finds the IPs of the booted coreos instances and - returns it under the host group 'coreos' -diff --git a/contrib/inventory/foreman.py b/contrib/inventory/foreman.py -index 9a87397..2483cce 100755 ---- a/contrib/inventory/foreman.py -+++ b/contrib/inventory/foreman.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # vim: set fileencoding=utf-8 : - # - # Copyright (C) 2016 Guido Günther <agx@sigxcpu.org>, -diff --git a/contrib/inventory/freeipa.py b/contrib/inventory/freeipa.py -index a72b774..1f092b2 100755 ---- a/contrib/inventory/freeipa.py -+++ b/contrib/inventory/freeipa.py + This script generated test_cases for test_distribution_version.py. +diff --git a/hacking/update-sanity-requirements.py b/hacking/update-sanity-requirements.py +index 997d6dbf87..16a47f0f3c 100755 +--- a/hacking/update-sanity-requirements.py ++++ b/hacking/update-sanity-requirements.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Generate frozen sanity test requirements from source requirements files.""" - import argparse - from ipalib import api -diff --git a/contrib/inventory/gce.py b/contrib/inventory/gce.py -index 5c58146..7616843 100755 ---- a/contrib/inventory/gce.py -+++ b/contrib/inventory/gce.py +diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py +index a54dacb70c..dc14986420 100755 +--- a/lib/ansible/cli/adhoc.py ++++ b/lib/ansible/cli/adhoc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # Copyright 2013 Google Inc. - # - # This file is part of Ansible -diff --git a/contrib/inventory/jail.py b/contrib/inventory/jail.py -index 98b6acf..b12289c 100755 ---- a/contrib/inventory/jail.py -+++ b/contrib/inventory/jail.py + # Copyright: (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py +index f394ef7c1e..e37c9fd619 100755 +--- a/lib/ansible/cli/config.py ++++ b/lib/ansible/cli/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2013, Michael Scherer <misc@zarb.org> - # -diff --git a/contrib/inventory/landscape.py b/contrib/inventory/landscape.py -index 4b53171..7f52639 100755 ---- a/contrib/inventory/landscape.py -+++ b/contrib/inventory/landscape.py + # Copyright: (c) 2017, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + # PYTHON_ARGCOMPLETE_OK +diff --git a/lib/ansible/cli/console.py b/lib/ansible/cli/console.py +index 2325bf05d6..475f03eb00 100755 +--- a/lib/ansible/cli/console.py ++++ b/lib/ansible/cli/console.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2015, Marc Abramowitz <marca@surveymonkey.com> - # -diff --git a/contrib/inventory/libvirt_lxc.py b/contrib/inventory/libvirt_lxc.py -index 35ccf40..ba3496d 100755 ---- a/contrib/inventory/libvirt_lxc.py -+++ b/contrib/inventory/libvirt_lxc.py + # Copyright: (c) 2014, Nandor Sivok <dominis@haxor.hu> + # Copyright: (c) 2016, Redhat Inc + # Copyright: (c) 2018, Ansible Project +diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py +index 4a5c892816..c99d25d9cb 100755 +--- a/lib/ansible/cli/doc.py ++++ b/lib/ansible/cli/doc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2013, Michael Scherer <misc@zarb.org> - # -diff --git a/contrib/inventory/linode.py b/contrib/inventory/linode.py -index 6fd922f..cab7a70 100755 ---- a/contrib/inventory/linode.py -+++ b/contrib/inventory/linode.py + # Copyright: (c) 2014, James Tanner <tanner.jc@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py +index 334e4bf4f0..9918f338c1 100755 +--- a/lib/ansible/cli/galaxy.py ++++ b/lib/ansible/cli/galaxy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - ''' - Linode external inventory script -diff --git a/contrib/inventory/lxc_inventory.py b/contrib/inventory/lxc_inventory.py -index d82bb61..f7ac67c 100755 ---- a/contrib/inventory/lxc_inventory.py -+++ b/contrib/inventory/lxc_inventory.py + # Copyright: (c) 2013, James Cammarata <jcammarata@ansible.com> + # Copyright: (c) 2018-2021, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/inventory.py b/lib/ansible/cli/inventory.py +index 3550079bf8..f1da0d0531 100755 +--- a/lib/ansible/cli/inventory.py ++++ b/lib/ansible/cli/inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # - # (c) 2015-16 Florian Haas, hastexo Professional Services GmbH - # <florian@hastexo.com> -diff --git a/contrib/inventory/mdt_dynamic_inventory.py b/contrib/inventory/mdt_dynamic_inventory.py -index 89ecc3e..5540a41 100755 ---- a/contrib/inventory/mdt_dynamic_inventory.py -+++ b/contrib/inventory/mdt_dynamic_inventory.py + # Copyright: (c) 2017, Brian Coca <bcoca@ansible.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/playbook.py b/lib/ansible/cli/playbook.py +index e63785b058..bc5fbc2f6f 100755 +--- a/lib/ansible/cli/playbook.py ++++ b/lib/ansible/cli/playbook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2016, Julian Barnett <jbarnett@tableau.com> - # -diff --git a/contrib/inventory/nagios_livestatus.py b/contrib/inventory/nagios_livestatus.py -index e1c145e..3e250cb 100755 ---- a/contrib/inventory/nagios_livestatus.py -+++ b/contrib/inventory/nagios_livestatus.py + # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py +index f369c390ec..f0ca673b36 100755 +--- a/lib/ansible/cli/pull.py ++++ b/lib/ansible/cli/pull.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2015, Yannig Perre <yannig.perre@gmail.com> - # -diff --git a/contrib/inventory/nagios_ndo.py b/contrib/inventory/nagios_ndo.py -index 49ec563..cc10a51 100755 ---- a/contrib/inventory/nagios_ndo.py -+++ b/contrib/inventory/nagios_ndo.py + # Copyright: (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py +index b1ed18c9c6..03c26d52cb 100755 +--- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py ++++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2014, Jonathan Lestrelin <jonathan.lestrelin@gmail.com> - # -diff --git a/contrib/inventory/nova.py b/contrib/inventory/nova.py -index f8c1617..d0ad7f0 100755 ---- a/contrib/inventory/nova.py -+++ b/contrib/inventory/nova.py + # Copyright: (c) 2017, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + from __future__ import (absolute_import, division, print_function) +diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py +index cf2c9dd901..3545624a09 100755 +--- a/lib/ansible/cli/vault.py ++++ b/lib/ansible/cli/vault.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> - # -diff --git a/contrib/inventory/nsot.py b/contrib/inventory/nsot.py -index 62be85a..0a8dc9b 100755 ---- a/contrib/inventory/nsot.py -+++ b/contrib/inventory/nsot.py + # (c) 2014, James Tanner <tanner.jc@gmail.com> + # Copyright: (c) 2018, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/packaging/cli-doc/build.py b/packaging/cli-doc/build.py +index 878ba8eabf..64a614f3f7 100755 +--- a/packaging/cli-doc/build.py ++++ b/packaging/cli-doc/build.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Build documentation for ansible-core CLI programs.""" - ''' - nsot -diff --git a/contrib/inventory/openshift.py b/contrib/inventory/openshift.py -index 479b808..dc398b5 100755 ---- a/contrib/inventory/openshift.py -+++ b/contrib/inventory/openshift.py +diff --git a/packaging/release.py b/packaging/release.py +index 97c58a7424..fa5a27f794 100755 +--- a/packaging/release.py ++++ b/packaging/release.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Manage upstream ansible-core releases.""" - # (c) 2013, Michael Scherer <misc@zarb.org> - # -diff --git a/contrib/inventory/openstack.py b/contrib/inventory/openstack.py -index 6679a2c..eb38742 100755 ---- a/contrib/inventory/openstack.py -+++ b/contrib/inventory/openstack.py +diff --git a/test/integration/targets/ansible-config/files/ini_dupes.py b/test/integration/targets/ansible-config/files/ini_dupes.py +index ed42e6acb8..e61252100e 100755 +--- a/test/integration/targets/ansible-config/files/ini_dupes.py ++++ b/test/integration/targets/ansible-config/files/ini_dupes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # Copyright (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> - # Copyright (c) 2013, Jesse Keating <jesse.keating@rackspace.com> -diff --git a/contrib/inventory/openvz.py b/contrib/inventory/openvz.py -index 1ef8ab1..d4dfcde 100755 ---- a/contrib/inventory/openvz.py -+++ b/contrib/inventory/openvz.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # openvz.py -diff --git a/contrib/inventory/ovirt.py b/contrib/inventory/ovirt.py -index 7f505d9..ada01fa 100755 ---- a/contrib/inventory/ovirt.py -+++ b/contrib/inventory/ovirt.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Copyright 2015 IIX Inc. - # - # This file is part of Ansible -diff --git a/contrib/inventory/ovirt4.py b/contrib/inventory/ovirt4.py -index 5ee5986..9d9e940 100755 ---- a/contrib/inventory/ovirt4.py -+++ b/contrib/inventory/ovirt4.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. -diff --git a/contrib/inventory/packet_net.py b/contrib/inventory/packet_net.py -index c40c821..d23eba1 100755 ---- a/contrib/inventory/packet_net.py -+++ b/contrib/inventory/packet_net.py + from __future__ import annotations +diff --git a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py +index 6182e865db..5829df52b5 100644 +--- a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py ++++ b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - Packet.net external inventory script -diff --git a/contrib/inventory/proxmox.py b/contrib/inventory/proxmox.py -index c0ffb0b..ef7a394 100755 ---- a/contrib/inventory/proxmox.py -+++ b/contrib/inventory/proxmox.py + # Copyright: (c) 2020, Ansible Project + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +diff --git a/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py b/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py +index 487666381f..86a3ea66d7 100755 +--- a/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py ++++ b/test/integration/targets/ansible-galaxy-role/files/create-role-archive.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Create a role archive which overwrites an arbitrary file.""" - # Copyright (C) 2014 Mathieu GAUTHIER-LAFAYE <gauthierl@lapth.cnrs.fr> - # -diff --git a/contrib/inventory/rackhd.py b/contrib/inventory/rackhd.py -index a89cb04..05b3ada 100755 ---- a/contrib/inventory/rackhd.py -+++ b/contrib/inventory/rackhd.py + import argparse +diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py +index 3c86b6dd07..393a945ff9 100755 +--- a/test/integration/targets/ansible-test-container/runme.py ++++ b/test/integration/targets/ansible-test-container/runme.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Test suite used to verify ansible-test is able to run its containers on various container hosts.""" - import json - import requests -diff --git a/contrib/inventory/rax.py b/contrib/inventory/rax.py -index d20a8ab..6c34753 100755 ---- a/contrib/inventory/rax.py -+++ b/contrib/inventory/rax.py + from __future__ import annotations +diff --git a/test/integration/targets/ansible-test-integration-targets/test.py b/test/integration/targets/ansible-test-integration-targets/test.py +index 8effb647fc..4e34c4bbc1 100755 +--- a/test/integration/targets/ansible-test-integration-targets/test.py ++++ b/test/integration/targets/ansible-test-integration-targets/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # (c) 2013, Jesse Keating <jesse.keating@rackspace.com, - # Paul Durivage <paul.durivage@rackspace.com>, -diff --git a/contrib/inventory/rhv.py b/contrib/inventory/rhv.py -index 5ee5986..9d9e940 100755 ---- a/contrib/inventory/rhv.py -+++ b/contrib/inventory/rhv.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2016 Red Hat, Inc. -diff --git a/contrib/inventory/rudder.py b/contrib/inventory/rudder.py -index 5cf16c9..a669c37 100755 ---- a/contrib/inventory/rudder.py -+++ b/contrib/inventory/rudder.py + import subprocess + import unittest +diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py +index 463915284b..fc2ed398d9 100755 +--- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py ++++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Run a command using a PTY.""" - # Copyright (c) 2015, Normation SAS - # -diff --git a/contrib/inventory/serf.py b/contrib/inventory/serf.py -index e1340da..6242eda 100755 ---- a/contrib/inventory/serf.py -+++ b/contrib/inventory/serf.py + import sys +diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py +index a2b094e2fc..355dba697a 100755 +--- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py ++++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Assert no TTY is available.""" - # (c) 2015, Marc Abramowitz <marca@surveymonkey.com> - # -diff --git a/contrib/inventory/softlayer.py b/contrib/inventory/softlayer.py -index 3933eb4..519092f 100755 ---- a/contrib/inventory/softlayer.py -+++ b/contrib/inventory/softlayer.py -@@ -1,4 +1,4 @@ + import sys +diff --git a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py +index 4265cc3e6c..e5a0d9b483 100755 +--- a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py ++++ b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py +@@ -1 +1 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """ - SoftLayer external inventory script. - -diff --git a/contrib/inventory/spacewalk.py b/contrib/inventory/spacewalk.py -index 2735a81..2da2720 100755 ---- a/contrib/inventory/spacewalk.py -+++ b/contrib/inventory/spacewalk.py -@@ -1,4 +1,4 @@ +diff --git a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py +index 4265cc3e6c..e5a0d9b483 100755 +--- a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py ++++ b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py +@@ -1 +1 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - """ - Spacewalk external inventory script -diff --git a/contrib/inventory/ssh_config.py b/contrib/inventory/ssh_config.py -index ae41e58..05373ec 100755 ---- a/contrib/inventory/ssh_config.py -+++ b/contrib/inventory/ssh_config.py +diff --git a/test/integration/targets/ansible-test/venv-pythons.py b/test/integration/targets/ansible-test/venv-pythons.py +index 97998bcd7c..aace3d346d 100755 +--- a/test/integration/targets/ansible-test/venv-pythons.py ++++ b/test/integration/targets/ansible-test/venv-pythons.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Return target Python options for use with ansible-test.""" - # (c) 2014, Tomas Karasek <tomas.karasek@digile.fi> - # -diff --git a/contrib/inventory/stacki.py b/contrib/inventory/stacki.py -index fd4cda5..d6acda3 100755 ---- a/contrib/inventory/stacki.py -+++ b/contrib/inventory/stacki.py + import argparse +diff --git a/test/integration/targets/ansible-vault/faux-editor.py b/test/integration/targets/ansible-vault/faux-editor.py +index b67c747563..a30c306a83 100755 +--- a/test/integration/targets/ansible-vault/faux-editor.py ++++ b/test/integration/targets/ansible-vault/faux-editor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # Copyright (c) 2016, Hugh Ma <hugh.ma@flextronics.com> # -diff --git a/contrib/inventory/vagrant.py b/contrib/inventory/vagrant.py -index 37a6741..86fc67d 100755 ---- a/contrib/inventory/vagrant.py -+++ b/contrib/inventory/vagrant.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Vagrant external inventory script. Automatically finds the IP of the booted vagrant vm(s), and - returns it under the host group 'vagrant' -diff --git a/contrib/inventory/vbox.py b/contrib/inventory/vbox.py -index 8905fab..141b01a 100755 ---- a/contrib/inventory/vbox.py -+++ b/contrib/inventory/vbox.py + # Ansible is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +diff --git a/test/integration/targets/ansible-vault/password-script.py b/test/integration/targets/ansible-vault/password-script.py +index 1b7f02beb2..0dcada23c7 100755 +--- a/test/integration/targets/ansible-vault/password-script.py ++++ b/test/integration/targets/ansible-vault/password-script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - - # This file is part of Ansible, # -diff --git a/contrib/inventory/vmware.py b/contrib/inventory/vmware.py -index 377c7cb..cee232a 100755 ---- a/contrib/inventory/vmware.py -+++ b/contrib/inventory/vmware.py + # Ansible is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +diff --git a/test/integration/targets/ansible-vault/test-vault-client.py b/test/integration/targets/ansible-vault/test-vault-client.py +index ee46188742..48244fca09 100755 +--- a/test/integration/targets/ansible-vault/test-vault-client.py ++++ b/test/integration/targets/ansible-vault/test-vault-client.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- - ''' - VMware Inventory Script -diff --git a/contrib/inventory/vmware_inventory.py b/contrib/inventory/vmware_inventory.py -index 58ee473..4300fe5 100755 ---- a/contrib/inventory/vmware_inventory.py -+++ b/contrib/inventory/vmware_inventory.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Requirements - # - pyvmomi >= 6.0.0.2016.4 -diff --git a/contrib/inventory/windows_azure.py b/contrib/inventory/windows_azure.py -index cceed36..f8777be 100755 ---- a/contrib/inventory/windows_azure.py -+++ b/contrib/inventory/windows_azure.py + from __future__ import (absolute_import, division, print_function) +diff --git a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py +index 93958fc2ad..33509c826a 100644 +--- a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py ++++ b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - ''' - Windows Azure external inventory script -diff --git a/contrib/inventory/zabbix.py b/contrib/inventory/zabbix.py -index f6b37b9..241823b 100755 ---- a/contrib/inventory/zabbix.py -+++ b/contrib/inventory/zabbix.py + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/cli/test-cli.py b/test/integration/targets/cli/test-cli.py +index 9893d6652e..7a07dcc108 100644 +--- a/test/integration/targets/cli/test-cli.py ++++ b/test/integration/targets/cli/test-cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # Copyright (c) 2019 Matt Martz <matt@sivel.net> + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # (c) 2013, Greg Buehler - # -diff --git a/contrib/inventory/zone.py b/contrib/inventory/zone.py -index 893953e..b049fd7 100755 ---- a/contrib/inventory/zone.py -+++ b/contrib/inventory/zone.py +diff --git a/test/integration/targets/cli/test_k_and_K.py b/test/integration/targets/cli/test_k_and_K.py +index f7077fba0a..dcc9614129 100644 +--- a/test/integration/targets/cli/test_k_and_K.py ++++ b/test/integration/targets/cli/test_k_and_K.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # (c) 2015, Dagobert Michelsen <dam@baltic-online.de> - # -diff --git a/docs/docsite/rst/dev_guide/developing_api.rst b/docs/docsite/rst/dev_guide/developing_api.rst -index bb2cbc4..55d4212 100644 ---- a/docs/docsite/rst/dev_guide/developing_api.rst -+++ b/docs/docsite/rst/dev_guide/developing_api.rst -@@ -37,7 +37,7 @@ Python API 2.0 - In 2.0 things get a bit more complicated to start, but you end up with much more discrete and readable classes:: - - -- #!/usr/bin/env python -+ #!/usr/bin/env python3 - - import json - from collections import namedtuple -diff --git a/hacking/dump_playbook_attributes.py b/hacking/dump_playbook_attributes.py -index 204fe3f..9d86b66 100755 ---- a/hacking/dump_playbook_attributes.py -+++ b/hacking/dump_playbook_attributes.py + # Make coding more python3-ish +diff --git a/test/integration/targets/collection/update-ignore.py b/test/integration/targets/collection/update-ignore.py +index 92a702cf13..9ea69089d5 100755 +--- a/test/integration/targets/collection/update-ignore.py ++++ b/test/integration/targets/collection/update-ignore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Rewrite a sanity ignore file to expand Python versions for import ignores and write the file out with the correct Ansible version in the name.""" - import optparse - from jinja2 import Environment, FileSystemLoader -diff --git a/hacking/module_formatter.py b/hacking/module_formatter.py -index 4f132aa..1bee33a 100755 ---- a/hacking/module_formatter.py -+++ b/hacking/module_formatter.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # (c) 2012, Jan-Piet Mens <jpmens () gmail.com> - # (c) 2012-2014, Michael DeHaan <michael@ansible.com> and others - # -diff --git a/lib/ansible/modules/web_infrastructure/django_manage.py b/lib/ansible/modules/web_infrastructure/django_manage.py -index ac24829..90aee1b 100644 ---- a/lib/ansible/modules/web_infrastructure/django_manage.py -+++ b/lib/ansible/modules/web_infrastructure/django_manage.py -@@ -97,7 +97,7 @@ notes: - - This module assumes English error messages for the 'createcachetable' command to detect table existence, unfortunately. - - To be able to use the migrate command with django versions < 1.7, you must have south installed and added as an app in your settings. - - To be able to use the collectstatic command, you must have enabled staticfiles in your settings. -- - As of ansible 2.x, your I(manage.py) application must be executable (rwxr-xr-x), and must have a valid I(shebang), i.e. "#!/usr/bin/env python", for invoking the appropriate Python interpreter. -+ - As of ansible 2.x, your I(manage.py) application must be executable (rwxr-xr-x), and must have a valid I(shebang), i.e. "#!/usr/bin/env python3", for invoking the appropriate Python interpreter. - requirements: [ "virtualenv", "django" ] - author: "Scott Anderson (@tastychutney)" - ''' -diff --git a/lib/ansible/modules/windows/win_file_version.py b/lib/ansible/modules/windows/win_file_version.py -index 399c978..1225a06 100644 ---- a/lib/ansible/modules/windows/win_file_version.py -+++ b/lib/ansible/modules/windows/win_file_version.py + import os +diff --git a/test/integration/targets/debugger/test_run_once.py b/test/integration/targets/debugger/test_run_once.py +index 237f9c2d90..4fe74903d8 100755 +--- a/test/integration/targets/debugger/test_run_once.py ++++ b/test/integration/targets/debugger/test_run_once.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Get DLL or EXE build version -diff --git a/lib/ansible/modules/windows/win_firewall_rule.py b/lib/ansible/modules/windows/win_firewall_rule.py -index e4ab1e4..456523d 100644 ---- a/lib/ansible/modules/windows/win_firewall_rule.py -+++ b/lib/ansible/modules/windows/win_firewall_rule.py + import io + import os +diff --git a/test/integration/targets/fork_safe_stdio/run-with-pty.py b/test/integration/targets/fork_safe_stdio/run-with-pty.py +index 463915284b..fc2ed398d9 100755 +--- a/test/integration/targets/fork_safe_stdio/run-with-pty.py ++++ b/test/integration/targets/fork_safe_stdio/run-with-pty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + """Run a command using a PTY.""" - # (c) 2014, Timothy Vandenbrande <timothy.vandenbrande@gmail.com> - # -diff --git a/test/compile/compile.py b/test/compile/compile.py -index 01144c6..6e332a9 100755 ---- a/test/compile/compile.py -+++ b/test/compile/compile.py + import sys +diff --git a/test/integration/targets/gathering/uuid.fact b/test/integration/targets/gathering/uuid.fact +index 79e3f62677..2a294b33a8 100644 +--- a/test/integration/targets/gathering/uuid.fact ++++ b/test/integration/targets/gathering/uuid.fact @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Python syntax checker with lint friendly output.""" + # -*- coding: utf-8 -*- - import os -diff --git a/test/integration/cleanup_rax.py b/test/integration/cleanup_rax.py -index 5c757f5..bc3448b 100755 ---- a/test/integration/cleanup_rax.py -+++ b/test/integration/cleanup_rax.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import os - import re -diff --git a/test/integration/targets/embedded_module/library/test_integration_module b/test/integration/targets/embedded_module/library/test_integration_module -index f564619..0d46d15 100644 ---- a/test/integration/targets/embedded_module/library/test_integration_module -+++ b/test/integration/targets/embedded_module/library/test_integration_module -@@ -1,3 +1,3 @@ +diff --git a/test/integration/targets/gathering_facts/uuid.fact b/test/integration/targets/gathering_facts/uuid.fact +index 79e3f62677..2a294b33a8 100644 +--- a/test/integration/targets/gathering_facts/uuid.fact ++++ b/test/integration/targets/gathering_facts/uuid.fact +@@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # -*- coding: utf-8 -*- - print('{"changed":false, "msg":"this is the embedded module"}') -diff --git a/test/integration/targets/module_utils/module_utils/foo.py b/test/integration/targets/module_utils/module_utils/foo.py -index 20698f1..0cd5c85 100644 ---- a/test/integration/targets/module_utils/module_utils/foo.py -+++ b/test/integration/targets/module_utils/module_utils/foo.py -@@ -1,3 +1,3 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - foo = "FOO FROM foo.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bam.py b/test/integration/targets/module_utils/module_utils/sub/bam.py -index 566f8b7..0814485 100644 +index 566f8b7c47..0814485d5f 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam.py @@ -1,3 +1,3 @@ @@ -811,7 +560,7 @@ index 566f8b7..0814485 100644 bam = "BAM FROM sub/bam.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py -index b7ed707..97f9eed 100644 +index b7ed707211..97f9eedcdb 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py @@ -1,3 +1,3 @@ @@ -819,414 +568,155 @@ index b7ed707..97f9eed 100644 +#!/usr/bin/env python3 bam = "BAM FROM sub/bam/bam.py" -diff --git a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py -index 02fafd4..3a93360 100644 ---- a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py -+++ b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py -@@ -1,3 +1,3 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - bam = "BAM FROM sub/bar/bam.py" -diff --git a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py -index 8566901..40f0c94 100644 ---- a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py -+++ b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py -@@ -1,3 +1,3 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - bar = "BAR FROM sub/bar/bar.py" -diff --git a/test/integration/targets/service/files/ansible_test_service b/test/integration/targets/service/files/ansible_test_service -index 682edeb..e858909 100755 ---- a/test/integration/targets/service/files/ansible_test_service -+++ b/test/integration/targets/service/files/ansible_test_service -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # this is mostly based off of the code found here: - # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ -diff --git a/test/runner/ansible-test b/test/runner/ansible-test -index 801f07f..804aa8f 100755 ---- a/test/runner/ansible-test -+++ b/test/runner/ansible-test -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - """Test runner for all Ansible tests.""" - -diff --git a/test/runner/injector/ansible b/test/runner/injector/ansible -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible -+++ b/test/runner/injector/ansible -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-console b/test/runner/injector/ansible-console -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-console -+++ b/test/runner/injector/ansible-console -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-doc b/test/runner/injector/ansible-doc -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-doc -+++ b/test/runner/injector/ansible-doc -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-galaxy b/test/runner/injector/ansible-galaxy -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-galaxy -+++ b/test/runner/injector/ansible-galaxy -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-playbook b/test/runner/injector/ansible-playbook -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-playbook -+++ b/test/runner/injector/ansible-playbook -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-pull b/test/runner/injector/ansible-pull -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-pull -+++ b/test/runner/injector/ansible-pull -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/ansible-vault b/test/runner/injector/ansible-vault -index 57241c9..c463946 100755 ---- a/test/runner/injector/ansible-vault -+++ b/test/runner/injector/ansible-vault -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover b/test/runner/injector/cover -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover -+++ b/test/runner/injector/cover -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2 b/test/runner/injector/cover2 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2 -+++ b/test/runner/injector/cover2 +diff --git a/test/integration/targets/packaging_cli-doc/verify.py b/test/integration/targets/packaging_cli-doc/verify.py +index 7793fa8c24..71f82186dd 100755 +--- a/test/integration/targets/packaging_cli-doc/verify.py ++++ b/test/integration/targets/packaging_cli-doc/verify.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2.4 b/test/runner/injector/cover2.4 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2.4 -+++ b/test/runner/injector/cover2.4 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2.6 b/test/runner/injector/cover2.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2.6 -+++ b/test/runner/injector/cover2.6 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover2.7 b/test/runner/injector/cover2.7 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover2.7 -+++ b/test/runner/injector/cover2.7 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover3 b/test/runner/injector/cover3 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover3 -+++ b/test/runner/injector/cover3 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover3.5 b/test/runner/injector/cover3.5 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover3.5 -+++ b/test/runner/injector/cover3.5 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/cover3.6 b/test/runner/injector/cover3.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/cover3.6 -+++ b/test/runner/injector/cover3.6 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/injector.py b/test/runner/injector/injector.py -index 57241c9..c463946 100755 ---- a/test/runner/injector/injector.py -+++ b/test/runner/injector/injector.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/pytest b/test/runner/injector/pytest -index 57241c9..c463946 100755 ---- a/test/runner/injector/pytest -+++ b/test/runner/injector/pytest -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner b/test/runner/injector/runner -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner -+++ b/test/runner/injector/runner -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2 b/test/runner/injector/runner2 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2 -+++ b/test/runner/injector/runner2 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2.4 b/test/runner/injector/runner2.4 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2.4 -+++ b/test/runner/injector/runner2.4 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Code coverage wrapper.""" - - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2.6 b/test/runner/injector/runner2.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2.6 -+++ b/test/runner/injector/runner2.6 + import os + import pathlib +diff --git a/test/integration/targets/pause/test-pause.py b/test/integration/targets/pause/test-pause.py +index ab771fa09e..1dece083d3 100755 +--- a/test/integration/targets/pause/test-pause.py ++++ b/test/integration/targets/pause/test-pause.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner2.7 b/test/runner/injector/runner2.7 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner2.7 -+++ b/test/runner/injector/runner2.7 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/pip/files/setup.py b/test/integration/targets/pip/files/setup.py +index aaf21875ca..2835719e4f 100755 +--- a/test/integration/targets/pip/files/setup.py ++++ b/test/integration/targets/pip/files/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner3 b/test/runner/injector/runner3 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner3 -+++ b/test/runner/injector/runner3 + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/service/files/ansible_test_service.py b/test/integration/targets/service/files/ansible_test_service.py +index 6292272e63..e5664fb2e3 100644 +--- a/test/integration/targets/service/files/ansible_test_service.py ++++ b/test/integration/targets/service/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner3.5 b/test/runner/injector/runner3.5 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner3.5 -+++ b/test/runner/injector/runner3.5 + # this is mostly based off of the code found here: + # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ +diff --git a/test/integration/targets/service_facts/files/ansible_test_service.py b/test/integration/targets/service_facts/files/ansible_test_service.py +index 19f1e29138..609218325d 100644 +--- a/test/integration/targets/service_facts/files/ansible_test_service.py ++++ b/test/integration/targets/service_facts/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/injector/runner3.6 b/test/runner/injector/runner3.6 -index 57241c9..c463946 100755 ---- a/test/runner/injector/runner3.6 -+++ b/test/runner/injector/runner3.6 + # this is mostly based off of the code found here: + # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ +diff --git a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py +index b0a8889439..90c83b582b 100644 +--- a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py ++++ b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - """Code coverage wrapper.""" - from __future__ import absolute_import, print_function -diff --git a/test/runner/retry.py b/test/runner/retry.py -index 4972131..a9ffb07 100755 ---- a/test/runner/retry.py -+++ b/test/runner/retry.py + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/test_utils/scripts/timeout.py b/test/integration/targets/test_utils/scripts/timeout.py +index f88f3e4e15..c312dc4f6c 100755 +--- a/test/integration/targets/test_utils/scripts/timeout.py ++++ b/test/integration/targets/test_utils/scripts/timeout.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - """Automatically retry failed commands.""" -diff --git a/test/runner/test.py b/test/runner/test.py -index 801f07f..804aa8f 100755 ---- a/test/runner/test.py -+++ b/test/runner/test.py + import argparse + import subprocess +diff --git a/test/integration/targets/throttle/test_throttle.py b/test/integration/targets/throttle/test_throttle.py +index 1a5bdd3078..344bcf0f86 100755 +--- a/test/integration/targets/throttle/test_throttle.py ++++ b/test/integration/targets/throttle/test_throttle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - """Test runner for all Ansible tests.""" -diff --git a/test/sanity/code-smell/ansible-var-precedence-check.py b/test/sanity/code-smell/ansible-var-precedence-check.py -index e10c097..13c7a73 100755 ---- a/test/sanity/code-smell/ansible-var-precedence-check.py -+++ b/test/sanity/code-smell/ansible-var-precedence-check.py + from __future__ import (absolute_import, division, print_function) + __metaclass__ = type +diff --git a/test/integration/targets/var_precedence/ansible-var-precedence-check.py b/test/integration/targets/var_precedence/ansible-var-precedence-check.py +index b03c87b80f..2035463092 100755 +--- a/test/integration/targets/var_precedence/ansible-var-precedence-check.py ++++ b/test/integration/targets/var_precedence/ansible-var-precedence-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # A tool to check the order of precedence for ansible variables # https://github.com/ansible/ansible/blob/devel/test/integration/test_var_precedence.yml -diff --git a/test/sanity/code-smell/integration-aliases.py b/test/sanity/code-smell/integration-aliases.py -index 50301e3..ac53ca9 100755 ---- a/test/sanity/code-smell/integration-aliases.py -+++ b/test/sanity/code-smell/integration-aliases.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import os - import textwrap -diff --git a/test/sanity/code-smell/shebang.sh b/test/sanity/code-smell/shebang.sh -index 76d72c1..565a198 100755 ---- a/test/sanity/code-smell/shebang.sh -+++ b/test/sanity/code-smell/shebang.sh -@@ -8,11 +8,11 @@ grep '^#!' -rIn . \ - -e '^\./test/integration/targets/[^/]*/library/[^/]*:#!powershell$' \ - -e '^\./test/integration/targets/[^/]*/library/[^/]*:#!/usr/bin/python$' \ - -e '^\./test/integration/targets/module_precedence/.*lib.*:#!/usr/bin/python$' \ -- -e '^\./hacking/cherrypick.py:#!/usr/bin/env python3$' \ -+ -e '^\./hacking/cherrypick.py:#!/usr/bin/env python33$' \ - -e ':#!/bin/sh$' \ - -e ':#!/bin/bash( -[eux]|$)' \ - -e ':#!/usr/bin/make -f$' \ -- -e ':#!/usr/bin/env python$' \ -+ -e ':#!/usr/bin/env python3$' \ - -e ':#!/usr/bin/env bash$' \ - -e ':#!/usr/bin/env fish$' \ - -diff --git a/test/sanity/validate-modules/test_validate_modules_regex.py b/test/sanity/validate-modules/test_validate_modules_regex.py -index 0e41ee7..8a86b07 100644 ---- a/test/sanity/validate-modules/test_validate_modules_regex.py -+++ b/test/sanity/validate-modules/test_validate_modules_regex.py +diff --git a/test/lib/ansible_test/_internal/util_common.py b/test/lib/ansible_test/_internal/util_common.py +index 77a6165c8e..865158e3b1 100644 +--- a/test/lib/ansible_test/_internal/util_common.py ++++ b/test/lib/ansible_test/_internal/util_common.py +@@ -303,7 +303,7 @@ def get_injector_path() -> str: + ]) + + scripts = ( +- ('python.py', '/usr/bin/env python', MODE_FILE_EXECUTE), ++ ('python.py', '/usr/bin/env python3', MODE_FILE_EXECUTE), + ('virtualenv.sh', '/usr/bin/env bash', MODE_FILE), + ) + +diff --git a/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py b/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py +index b0b1319783..9535c3b481 100644 +--- a/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py ++++ b/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py +@@ -16,14 +16,14 @@ def main(): + b'#!/usr/bin/env bash', + b'#!/usr/bin/env fish', + b'#!/usr/bin/env pwsh', +- b'#!/usr/bin/env python', ++ b'#!/usr/bin/env python3', + b'#!/usr/bin/make -f', + ]) + + integration_shebangs = set([ + b'#!/bin/sh', + b'#!/usr/bin/env bash', +- b'#!/usr/bin/env python', ++ b'#!/usr/bin/env python3', + ]) + + module_shebangs = { +diff --git a/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py b/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py +index 930654fc1e..bbf50369d7 100755 +--- a/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py ++++ b/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # PYTHON_ARGCOMPLETE_OK + """Command line entry point for ansible-test.""" - # This is a standalone test for the regex inside validate-modules - # It is not suitable to add to the make tests target because the -diff --git a/test/sanity/validate-modules/validate-modules b/test/sanity/validate-modules/validate-modules -index d03bff1..201cd41 100755 ---- a/test/sanity/validate-modules/validate-modules -+++ b/test/sanity/validate-modules/validate-modules -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # - # Copyright (C) 2015 Matt Martz <matt@sivel.net> diff --git a/test/units/executor/module_common/test_module_common.py b/test/units/executor/module_common/test_module_common.py -index edbf836..1f3bb5a 100644 +index 6e2a4956c4..6776de66e1 100644 --- a/test/units/executor/module_common/test_module_common.py +++ b/test/units/executor/module_common/test_module_common.py -@@ -114,5 +114,5 @@ class TestGetShebang(object): +@@ -117,8 +117,8 @@ class TestGetShebang: (u'#!/usr/bin/python3 -tt -OO', u'/usr/bin/python3') - def test_python_via_env(self): -- assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python'}) == \ + def test_python_via_env(self, templar): +- assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python'}, templar) == \ - (u'#!/usr/bin/env python', u'/usr/bin/env python') -+ assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python3'}) == \ -+ (u'#!/usr/bin/env python3', u'/usr/bin/env python') -diff --git a/test/units/modules/network/nxos/test_nxos_config.py b/test/units/modules/network/nxos/test_nxos_config.py -index 8e3a59c..46764a8 100644 ---- a/test/units/modules/network/nxos/test_nxos_config.py -+++ b/test/units/modules/network/nxos/test_nxos_config.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # (c) 2016 Red Hat Inc. - # -diff --git a/test/utils/shippable/ansible-core-ci b/test/utils/shippable/ansible-core-ci -index e91b426..44f8fb9 100755 ---- a/test/utils/shippable/ansible-core-ci -+++ b/test/utils/shippable/ansible-core-ci -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 ++ assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python3'}, templar) == \ ++ (u'#!/usr/bin/env python3', u'/usr/bin/env python3') - # (c) 2016 Matt Clay <matt@mystile.com> - # -diff --git a/test/utils/shippable/download.py b/test/utils/shippable/download.py -index cbda144..e86c8e6 100755 ---- a/test/utils/shippable/download.py -+++ b/test/utils/shippable/download.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # PYTHON_ARGCOMPLETE_OK - # (c) 2016 Red Hat, Inc. + class TestDetectionRegexes: -- -2.7.4 +2.25.1 diff --git a/recipes-devtools/python/python3-ansible_2.3.1.0.bb b/recipes-devtools/python/python3-ansible_2.16.5.bb index ea0fdbe5..f3ab2377 100644 --- a/recipes-devtools/python/python3-ansible_2.3.1.0.bb +++ b/recipes-devtools/python/python3-ansible_2.16.5.bb @@ -1,7 +1,11 @@ inherit setuptools3 require python-ansible.inc -RDEPENDS:${PN} += "python3-pyyaml python3-jinja2 python3-modules" +RDEPENDS:${PN} += "python3-pyyaml \ + python3-jinja2 \ + python3-modules \ + locale-base-en-us \ +" SRC_URI += " \ file://python3-ensure-py-scripts-use-py3-for-shebang.patch \ diff --git a/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch 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 baa8962b..c5f21c70 100644 --- a/recipes-extended/glusterfs/glusterfs.inc +++ b/recipes-extended/glusterfs/glusterfs.inc @@ -20,6 +20,7 @@ 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 = "(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" @@ -29,9 +30,10 @@ LIC_FILES_CHKSUM = "file://COPYING-GPLV2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 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-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 d7354c44..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 @@ -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" |