diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-09 04:25:42 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-21 20:18:43 +0300 |
| commit | f7ea135d0342e3aaa1c5078c64597f8960f70696 (patch) | |
| tree | 2431c75a0af4ac103751ef7404fde7919e1cdfc4 /meta-phosphor/common/recipes-devtools/python/python-gevent/0001-gevent-py279-ssl-wrap.patch | |
| parent | b220f9939d3a1696ca910d1149a7172d28692004 (diff) | |
| download | openbmc-f7ea135d0342e3aaa1c5078c64597f8960f70696.tar.xz | |
remove use of meta-virtualization
Remove meta-virtualization from any bblayer.conf.samples. It was
originally added for the python-pyyaml and python-gevent recipes
but better maintained versions of these recipes are provided by
meta-python.
Before this can be done the python-gevent bbappend in the phosphor
layer must be removed. The version scope was wildcarded to any version
but the patches don't apply to python-gevent_1.2.2, which becomes the
default from meta-python when meta-virt is removed. Drop the bbappend.
Change-Id: I6658a163460e3c8e63dc7371ffff803a7b6915b5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-devtools/python/python-gevent/0001-gevent-py279-ssl-wrap.patch')
| -rw-r--r-- | meta-phosphor/common/recipes-devtools/python/python-gevent/0001-gevent-py279-ssl-wrap.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent/0001-gevent-py279-ssl-wrap.patch b/meta-phosphor/common/recipes-devtools/python/python-gevent/0001-gevent-py279-ssl-wrap.patch deleted file mode 100644 index 3edf243ff..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-gevent/0001-gevent-py279-ssl-wrap.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/gevent/ssl.py 2015-03-13 05:44:39.000000000 +0800 -+++ b/gevent/ssl.py 2015-03-13 05:44:24.000000000 +0800 -@@ -19,6 +19,25 @@ - except AttributeError: - _ssl = __ssl__._ssl2 - -+import inspect -+ -+ -+def new_sslwrap(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=__ssl__.CERT_NONE, ssl_version=__ssl__.PROTOCOL_SSLv23, ca_certs=None, ciphers=None): -+ context = __ssl__.SSLContext(ssl_version) -+ context.verify_mode = cert_reqs or __ssl__.CERT_NONE -+ if ca_certs: -+ context.load_verify_locations(ca_certs) -+ if certfile: -+ context.load_cert_chain(certfile, keyfile) -+ if ciphers: -+ context.set_ciphers(ciphers) -+ -+ caller_self = inspect.currentframe().f_back.f_locals['self'] -+ return context._wrap_socket(sock, server_side=server_side, ssl_sock=caller_self) -+ -+if not hasattr(_ssl, 'sslwrap'): -+ _ssl.sslwrap = new_sslwrap -+ - import sys - import errno - from gevent.socket import socket, _fileobject, timeout_default |