diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch')
-rw-r--r-- | poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch | 42 |
1 files changed, 42 insertions, 0 deletions
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 new file mode 100644 index 000000000..688da6b20 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pbr/0001-change-shebang-to-python3.patch @@ -0,0 +1,42 @@ +From 09bd8368bf0d5385663a10eeb890131481681bdd Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 23 Apr 2020 09:28:58 +0000 +Subject: [PATCH] change shebang to python3 + +Upstream-Status: Pending + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + 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 + |