Merge "dnsmasq: disable dnsmasq service as default"
diff --git a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
index d698a15..ceb743d 100644
--- a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
+++ b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
@@ -5111,7 +5111,7 @@
python-enum-0.4.4-r0.corei7_64
python-enum34-1.1.6-r0.corei7_64
python-enum-compat-0.0.2-r0.corei7_64
-python-eventlet-0.20.0-r0.corei7_64
+python-eventlet-0.18.4-r0.corei7_64
python-extras-1.0.0-r0.corei7_64
python-falcon-0.2-r0.corei7_64
python-fasteners-0.13.0+git0+c055890c98-r0.corei7_64
diff --git a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
index 5459598..cdcbfdc 100644
--- a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
+++ b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
@@ -5104,7 +5104,7 @@
python-enum-0.4.4-r0.corei7_64
python-enum34-1.1.6-r0.corei7_64
python-enum-compat-0.0.2-r0.corei7_64
-python-eventlet-0.20.0-r0.corei7_64
+python-eventlet-0.18.4-r0.corei7_64
python-extras-1.0.0-r0.corei7_64
python-falcon-0.2-r0.corei7_64
python-fasteners-0.13.0+git0+c055890c98-r0.corei7_64
diff --git a/meta-stx/conf/distro/include/stx-preferred-vers.inc b/meta-stx/conf/distro/include/stx-preferred-vers.inc
index d48c279..92d6b0b 100644
--- a/meta-stx/conf/distro/include/stx-preferred-vers.inc
+++ b/meta-stx/conf/distro/include/stx-preferred-vers.inc
@@ -60,3 +60,4 @@
PREFERRED_VERSION_ruby = "2.0.0-p648"
PREFERRED_VERSION_ruby-native = "2.0.0-p648"
PREFERRED_VERSION_puppet = "4.8.2"
+PREFERRED_VERSION_python-eventlet = "0.18.4"
diff --git a/meta-stx/recipes-devtools/python/python-eventlet_0.18.4.bb b/meta-stx/recipes-devtools/python/python-eventlet_0.18.4.bb
new file mode 100644
index 0000000..db3ded1
--- /dev/null
+++ b/meta-stx/recipes-devtools/python/python-eventlet_0.18.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Highly concurrent networking library"
+HOMEPAGE = "http://pypi.python.org/pypi/eventlet"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
+
+SRC_URI[md5sum] = "8d1c646d8cc10a4958c92fe8a30f3676"
+SRC_URI[sha256sum] = "74ef11d67ee5e85e009b0fced733c907620bca1ab8e6b0489d9f247405ab2685"
+
+inherit setuptools pypi
+
+RDEPENDS_${PN} += " \
+ python-enum34 \
+ python-enum-compat \
+ python-greenlet \
+ "