From 35a774200999ac2fca48693c1c169bf99d2f63ea Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 26 May 2020 13:25:03 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: ed3bdd7fbc(dunfell) meta-raspberrypi: 8066fac91d(dunfell) meta-security: d83f7cb0c9(dunfell) meta-openembedded: e413c1ef62(dunfell) Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232 Signed-off-by: Brad Bishop --- .../0001-change-shebang-to-python3.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch (limited to 'poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch') diff --git a/poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch b/poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch deleted file mode 100644 index 688da6b204..0000000000 --- a/poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 09bd8368bf0d5385663a10eeb890131481681bdd Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 23 Apr 2020 09:28:58 +0000 -Subject: [PATCH] change shebang to python3 - -Upstream-Status: Pending - -Signed-off-by: Changqing Li ---- - pbr/tests/test_integration.py | 2 +- - pbr/tests/test_packaging.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pbr/tests/test_integration.py b/pbr/tests/test_integration.py -index 8e96f21..b07cbe3 100644 ---- a/pbr/tests/test_integration.py -+++ b/pbr/tests/test_integration.py -@@ -150,7 +150,7 @@ class TestInstallWithoutPbr(base.BaseTestCase): - pkgs = { - 'pkgTest': { - 'setup.py': textwrap.dedent("""\ -- #!/usr/bin/env python -+ #!/usr/bin/env python3 - import setuptools - setuptools.setup( - name = 'pkgTest', -diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py -index 07be547..f6a9412 100644 ---- a/pbr/tests/test_packaging.py -+++ b/pbr/tests/test_packaging.py -@@ -206,7 +206,7 @@ class CreatePackages(fixtures.Fixture): - - defaults = { - 'setup.py': textwrap.dedent(six.u("""\ -- #!/usr/bin/env python -+ #!/usr/bin/env python3 - import setuptools - setuptools.setup( - setup_requires=['pbr'], --- -2.24.1 - -- cgit v1.2.3