summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
diff options
context:
space:
mode:
authorRandy MacLeod <randy.macleod@windriver.com>2022-03-20 18:21:36 -0700
committerKhem Raj <raj.khem@gmail.com>2022-03-24 09:45:25 -0700
commit11fa9655652130d91f419b359284ea9dca176010 (patch)
tree6dcaf6f09b751f2155cf729112091a76de0a22a8 /meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
parent04e87edf6db027c3a67d8b67ba2a23237dc4f49d (diff)
downloadmeta-openembedded-11fa9655652130d91f419b359284ea9dca176010.tar.gz
syslog-ng: update from 3.31.2 to 3.26.1
Drop two patches that are upstream now: 90459087f scl: fix wrong ownership during installation c1054d3f6 python: s/python/python3/ shebang (exclude tests) Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch')
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch b/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
deleted file mode 100644
index a8be7d81d6..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From b64fcc414316592968f181c85447cfd01d1e461e Mon Sep 17 00:00:00 2001
2From: Yi Fan Yu <yifan.yu@windriver.com>
3Date: Thu, 15 Apr 2021 13:48:19 -0400
4Subject: [PATCH] *.py: s/python/python3/ (exclude tests)
5
6As stated by https://github.com/syslog-ng/syslog-ng/pull/3603
7python2 is EOL.
8
9Fix all shebangs calling python instead of python3
10except the tests.
11
12(correcting lib/merge-grammar.py)
13Signed-off-by: Joe Slater <joe.slater@windriver.com>
14(adding the rest)
15Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/3647]
16
17Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
18---
19 contrib/scripts/config-graph-json-to-dot.py | 2 +-
20 lib/merge-grammar.py | 2 +-
21 modules/python/pylib/setup.py | 2 +-
22 3 files changed, 3 insertions(+), 3 deletions(-)
23
24diff --git a/contrib/scripts/config-graph-json-to-dot.py b/contrib/scripts/config-graph-json-to-dot.py
25index 4955c81..0351a9a 100755
26--- a/contrib/scripts/config-graph-json-to-dot.py
27+++ b/contrib/scripts/config-graph-json-to-dot.py
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env python
30+#!/usr/bin/env python3
31 import json, sys
32
33 j = None
34diff --git a/lib/merge-grammar.py b/lib/merge-grammar.py
35index 7313ff5..459712d 100755
36--- a/lib/merge-grammar.py
37+++ b/lib/merge-grammar.py
38@@ -1,4 +1,4 @@
39-#!/usr/bin/env python
40+#!/usr/bin/env python3
41 #############################################################################
42 # Copyright (c) 2010-2017 Balabit
43 #
44diff --git a/modules/python/pylib/setup.py b/modules/python/pylib/setup.py
45index 23bb5cc..a2fa05e 100755
46--- a/modules/python/pylib/setup.py
47+++ b/modules/python/pylib/setup.py
48@@ -1,4 +1,4 @@
49-#!/usr/bin/env python
50+#!/usr/bin/env python3
51 #############################################################################
52 # Copyright (c) 2015-2016 Balabit
53 #