python-tornado: update to the 2.2 release

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 4 insertions, 5 deletions

diff --git a/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch b/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
index a3efbcaac..3c3ec7c85 100644
--- a/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
+++ b/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
@@ -24,7 +24,7 @@ index cfff0ba..c181f24 100644
 -        # exist on some platforms (specifically WinXP, although
 -        # newer versions of windows have it)
 -        flags |= socket.AI_ADDRCONFIG
-     for res in socket.getaddrinfo(address, port, family, socket.SOCK_STREAM,
+     for res in set(socket.getaddrinfo(address, port, family, socket.SOCK_STREAM,
                                    0, flags):
          af, socktype, proto, canonname, sockaddr = res
 -- 
diff --git a/meta-oe/recipes-devtools/python/python-tornado_git.bb b/meta-oe/recipes-devtools/python/python-tornado_git.bb
index 22078bc0f..693b4544b 100644
--- a/meta-oe/recipes-devtools/python/python-tornado_git.bb
+++ b/meta-oe/recipes-devtools/python/python-tornado_git.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "Tornado is an open source version of the scalable, non-blocking w
 LICENSE = "Apache"
 LIC_FILES_CHKSUM = "file://README;md5=e7fb9954003d7cd93322ccf282210d1c"
 
-PV = "2.1.1"
-PR = "r4"
-SRCREV = "112fdb48b06b754d1f94335ea9e2fd62a07a5fe3"
-SRC_URI = "git://github.com/facebook/tornado.git \
+PV = "2.2"
+SRCREV = "02bc76155de5bf4dca243e4d0c019c0ac4c8b3be"
+SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \
            file://0001-disable-AI_ADDRCONFIG-flag.patch \
           "