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 | |
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>
19 files changed, 0 insertions, 85 deletions
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample index ccd209947..811368ca4 100644 --- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-arm \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-arm \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample index 8b1910b2c..b428881e0 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-evb \ @@ -26,7 +25,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-evb \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample index fa35e4d3d..454e217d7 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample @@ -11,7 +11,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-oe \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \ ##OEROOT##/meta-openbmc-machines/meta-evb \ @@ -24,7 +23,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-oe \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \ ##OEROOT##/meta-openbmc-machines/meta-evb \ diff --git a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample index 03142d65d..d70b2b1aa 100644 --- a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/import-layers/meta-raspberrypi \ " @@ -23,7 +22,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/import-layers/meta-raspberrypi \ " diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample index 89d3549a8..9be37e679 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample index b06f6a28c..57513206a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample index 18a97de55..aa8a2b365 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample index 4be9f2685..d5504265e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample index cf49c35c5..baddd56d9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -26,7 +25,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample index 306b0f93f..e3c6dacfa 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-openpower \ diff --git a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample index 1f4bbcaaf..586bf2fc3 100644 --- a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample index 2dcafab42..d0da209f3 100644 --- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ diff --git a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample index ff145b0a7..8e9c81dfd 100644 --- a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \ diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample index 86c3a2298..94effa217 100644 --- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample +++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample @@ -13,7 +13,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ @@ -28,7 +27,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-perl \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ ##OEROOT##/meta-openbmc-machines/meta-x86 \ 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 diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent/0002-gevent-eat-ssl-self-cert-errors.patch b/meta-phosphor/common/recipes-devtools/python/python-gevent/0002-gevent-eat-ssl-self-cert-errors.patch deleted file mode 100644 index 36990e851..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-gevent/0002-gevent-eat-ssl-self-cert-errors.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/gevent/ssl.py 2016-11-02 13:17:37.917401795 -0500 -+++ b/gevent/newssl.py 2016-11-02 13:17:23.085401962 -0500 -@@ -334,6 +334,8 @@ class SSLSocket(socket): - raise - sys.exc_clear() - self._wait(self._write_event, timeout_exc=_SSLErrorHandshakeTimeout) -+ elif ex.reason in ['SSLV3_ALERT_CERTIFICATE_EXPIRED', 'TLSV1_ALERT_UNKNOWN_CA']: -+ return None - else: - raise - - def connect(self, addr): - """Connects to remote ADDR, and then wraps the connection in diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent/libev-config-guess.patch b/meta-phosphor/common/recipes-devtools/python/python-gevent/libev-config-guess.patch deleted file mode 100644 index 238052882..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-gevent/libev-config-guess.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/libev/config.guess 2016-06-09 00:16:50.616787488 -0400 -+++ b/libev/config.guess 2016-06-09 00:18:30.441578080 -0400 -@@ -921,6 +921,9 @@ EOF - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent_%.bbappend b/meta-phosphor/common/recipes-devtools/python/python-gevent_%.bbappend deleted file mode 100644 index 4dd9786de..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-gevent_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://libev-config-guess.patch" -SRC_URI += "file://0001-gevent-py279-ssl-wrap.patch" -SRC_URI += "file://0002-gevent-eat-ssl-self-cert-errors.patch" diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample index 3f9182d75..1fbaa5215 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -12,7 +12,6 @@ BBLAYERS ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ ##OEROOT##/meta-phosphor \ " BBLAYERS_NON_REMOVABLE ?= " \ @@ -22,5 +21,4 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/import-layers/meta-openembedded/meta-networking \ ##OEROOT##/import-layers/meta-openembedded/meta-python \ ##OEROOT##/import-layers/meta-openembedded/meta-webserver \ - ##OEROOT##/import-layers/meta-virtualization \ " |