From d0d2a7217da4dfa11c34845a1133d16786fbb9b0 Mon Sep 17 00:00:00 2001 From: "Fagundes, Paulo" Date: Mon, 24 Feb 2020 13:07:05 -0700 Subject: ] salt: bump 2018.3 -> 3000 Signed-off-by: Paulo Fagundes Signed-off-by: Bruce Ashfield --- .../salt/salt/set_python_location_hashbang.patch | 145 ++++++++++++++------- 1 file changed, 98 insertions(+), 47 deletions(-) (limited to 'meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch') 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 index 2369d4c..76d6f41 100644 --- a/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch +++ b/meta-openstack/recipes-support/salt/salt/set_python_location_hashbang.patch @@ -6,102 +6,153 @@ Upstream-Status: Pending # processes that are generically named python. Changed shebang so # process names will be identifiable by the init scripts. -diff -Naur a/scripts/salt-api b/scripts/salt-api ---- a/scripts/salt-api 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-api 2015-04-08 16:49:03.336483297 -0500 +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/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 -Naur a/scripts/salt-call b/scripts/salt-call ---- a/scripts/salt-call 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-call 2015-04-08 16:49:11.360507977 -0500 +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/python ++#!/usr/bin/env python3 ''' Directly call a salt command in the modules, does not require a running salt minion to run. -diff -Naur a/scripts/salt-cloud b/scripts/salt-cloud ---- a/scripts/salt-cloud 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-cloud 2015-04-08 16:49:20.612536436 -0500 +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/python ++#!/usr/bin/env python3 ''' Publish commands to the salt system from the command line on the master. ''' -diff -Naur a/scripts/salt-cp b/scripts/salt-cp ---- a/scripts/salt-cp 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-cp 2015-04-08 16:49:30.132565723 -0500 +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/python ++#!/usr/bin/env python3 ''' Publish commands to the salt system from the command line on the master. ''' -diff -Naur a/scripts/salt-key b/scripts/salt-key ---- a/scripts/salt-key 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-key 2015-04-08 16:49:39.912595801 -0500 +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/python ++#!/usr/bin/env python3 ''' Manage the authentication keys with salt-key ''' -diff -Naur a/scripts/salt-master b/scripts/salt-master ---- a/scripts/salt-master 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-master 2015-04-08 16:49:50.224627508 -0500 +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/python ++#!/usr/bin/env python3 ''' Start the salt-master ''' -diff -Naur a/scripts/salt-minion b/scripts/salt-minion ---- a/scripts/salt-minion 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-minion 2015-04-08 16:49:57.808650832 -0500 +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/python ++#!/usr/bin/env python3 ''' This script is used to kick off a salt minion daemon ''' -diff -Naur a/scripts/salt-run b/scripts/salt-run ---- a/scripts/salt-run 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-run 2015-04-08 16:50:06.588677825 -0500 +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/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 -Naur a/scripts/salt-ssh b/scripts/salt-ssh ---- a/scripts/salt-ssh 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-ssh 2015-04-08 16:50:13.680699631 -0500 +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/python ++#!/usr/bin/env python3 ''' Execute the salt ssh system ''' -diff -Naur a/scripts/salt-syndic b/scripts/salt-syndic ---- a/scripts/salt-syndic 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-syndic 2015-04-08 16:50:20.892721803 -0500 +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/python ++#!/usr/bin/env python3 ''' This script is used to kick off a salt syndic daemon ''' -diff -Naur a/scripts/salt-unity b/scripts/salt-unity ---- a/scripts/salt-unity 2015-04-08 16:48:01.912294278 -0500 -+++ b/scripts/salt-unity 2015-04-08 16:50:35.968768142 -0500 +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 python2 -+#!/usr/bin/python2 +-#!/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. - # Import python libs - import sys -- cgit v1.2.3-54-g00ecf