Signed-off-by: Paulo Fagundes <[email protected]> --- .../salt/set_python_location_hashbang.patch | 158 ------------------ .../salt/{salt_3000.bb => salt_3001.bb} | 7 +- 2 files changed, 3 insertions(+), 162 deletions(-) delete mode 100644 meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch rename meta-openstack/recipes-support/salt/{salt_3000.bb => salt_3001.bb} (97%)
diff --git a/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch b/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch deleted file mode 100644 index 76d6f41..0000000 --- a/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch +++ /dev/null @@ -1,158 +0,0 @@ -Upstream-Status: Pending - -# The Salt SysV scripts require that the process name of the salt -# components have the form "salt-<component>". -# The current python shebangs on the salt components scripts spwans -# processes that are generically named python. Changed shebang so -# process names will be identifiable by the init scripts. - -diff --git a/scripts/salt b/scripts/salt -index 1a6d6b4d0c..0408ad07b2 100755 ---- a/scripts/salt -+++ b/scripts/salt -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - ''' -diff --git a/scripts/salt-api b/scripts/salt-api -index 6f028bacb6..7a51117822 100755 ---- a/scripts/salt-api -+++ b/scripts/salt-api -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Import salt libs - from salt.scripts import salt_api -diff --git a/scripts/salt-call b/scripts/salt-call -index 5b8a8f3935..9ddda9428d 100755 ---- a/scripts/salt-call -+++ b/scripts/salt-call -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Directly call a salt command in the modules, does not require a running salt - minion to run. -diff --git a/scripts/salt-cloud b/scripts/salt-cloud -index e977b68179..01c593881c 100755 ---- a/scripts/salt-cloud -+++ b/scripts/salt-cloud -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - ''' -diff --git a/scripts/salt-cp b/scripts/salt-cp -index 3da660d137..dcc3f11554 100755 ---- a/scripts/salt-cp -+++ b/scripts/salt-cp -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - ''' -diff --git a/scripts/salt-extend b/scripts/salt-extend -index 5385a7b6a9..b01c584bb4 100755 ---- a/scripts/salt-extend -+++ b/scripts/salt-extend -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Quickstart for creating an/or extending the functionality of your SaltStack installation - -diff --git a/scripts/salt-key b/scripts/salt-key -index cb26dfd5a6..596b202a3f 100755 ---- a/scripts/salt-key -+++ b/scripts/salt-key -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Manage the authentication keys with salt-key - ''' -diff --git a/scripts/salt-master b/scripts/salt-master -index b4323bd532..52bb47dc47 100755 ---- a/scripts/salt-master -+++ b/scripts/salt-master -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Start the salt-master - ''' -diff --git a/scripts/salt-minion b/scripts/salt-minion -index 74a9fa1d67..4a23ed9122 100755 ---- a/scripts/salt-minion -+++ b/scripts/salt-minion -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - This script is used to kick off a salt minion daemon - ''' -diff --git a/scripts/salt-proxy b/scripts/salt-proxy -index e921e6590b..443774ef85 100755 ---- a/scripts/salt-proxy -+++ b/scripts/salt-proxy -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - ''' - This script is used to kick off a salt proxy minion daemon -diff --git a/scripts/salt-run b/scripts/salt-run -index 2b2d86554c..cfef160ab0 100755 ---- a/scripts/salt-run -+++ b/scripts/salt-run -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Execute a salt convenience routine - ''' -diff --git a/scripts/salt-ssh b/scripts/salt-ssh -index 4f21baa5f4..77bb6ceb38 100755 ---- a/scripts/salt-ssh -+++ b/scripts/salt-ssh -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Execute the salt ssh system - ''' -diff --git a/scripts/salt-syndic b/scripts/salt-syndic -index d6faf2df63..896bf5f3b0 100755 ---- a/scripts/salt-syndic -+++ b/scripts/salt-syndic -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - This script is used to kick off a salt syndic daemon - ''' -diff --git a/scripts/salt-unity b/scripts/salt-unity -index b0a2d31597..ff1fa9034c 100755 ---- a/scripts/salt-unity -+++ b/scripts/salt-unity -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from salt.scripts import salt_unity - -diff --git a/scripts/spm b/scripts/spm -index 027864ee11..4d9b648b5d 100755 ---- a/scripts/spm -+++ b/scripts/spm -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ''' - Publish commands to the salt system from the command line on the master. - diff --git a/meta-openstack/recipes-support/salt/salt_3000.bb b/meta-openstack/recipes-support/salt/salt_3001.bb similarity index 97% rename from meta-openstack/recipes-support/salt/salt_3000.bb rename to meta-openstack/recipes-support/salt/salt_3001.bb index c2bc8da..5140470 100644 --- a/meta-openstack/recipes-support/salt/salt_3000.bb +++ b/meta-openstack/recipes-support/salt/salt_3001.bb @@ -19,11 +19,10 @@ PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto," PACKAGECONFIG[tcp] = ",,python3-pycrypto" SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ - file://set_python_location_hashbang.patch \ " -SRC_URI[md5sum] = "8084ef6f2a275b627ae364b9d562b4ff" -SRC_URI[sha256sum] = "04fbc64933b375cbbefc9576bcc65167b74d5eec7f58e64d096d67529ea66500" +SRC_URI[md5sum] = "ae06cef7557e237a954491a069e79a25" +SRC_URI[sha256sum] = "5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154" SYSTEMD_AUTO_ENABLE_${PN}-master = "disable" @@ -100,7 +99,7 @@ SUMMARY_${PN}-common = "shared libraries that salt requires for all packages" DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ salt-master, salt-minion, and salt-syndic require to function." RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0)" -RRECOMMENDS_${PN}-common = "lsb" +RRECOMMENDS_${PN}-common = "lsb-release" RSUGGESTS_${PN}-common = "python3-mako python3-git" RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" -- 2.27.0 I wasn't sure on the RRECOMMENDS for lsb since it was removed and lsb-release was created in it's place.
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5554): https://lists.yoctoproject.org/g/meta-virtualization/message/5554 Mute This Topic: https://lists.yoctoproject.org/mt/75382673/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
