summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-07-30 14:37:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 07:34:06 +0100
commit363bec05e6e5c2be2d8d7ea23e48fee2a1ce14ad (patch)
treee0f960b70e7fbd8061000c2bb7d444ede1e0e71d /meta/recipes-devtools
parent54526259241f8a035e9aab9f3ef03a76debb59dc (diff)
downloadpoky-363bec05e6e5c2be2d8d7ea23e48fee2a1ce14ad.tar.gz
smartpm: set noprogress for pycurl
Set NOPROGRESS for pycurl just as same as default operation in pycurl module itself. If set NOPROGRESS with 0 for pycurl, it causes dead lock issue of Python GIL when call smart library by python gui just like pygtk. (From OE-Core rev: 0d1f99fe1446edfb8864cbbc5a8b0059391c9bbc) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch20
-rw-r--r--meta/recipes-devtools/python/python-smartpm_git.bb1
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch b/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch
new file mode 100644
index 0000000000..2885998acc
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-set-noprogress-for-pycurl.patch
@@ -0,0 +1,20 @@
1Set NOPROGRESS for pycurl just as same as default operation in pycurl module itself.
2If set NOPROGRESS with 0 for pycurl, it causes dead lock issue of Python GIL when
3call smart library by python gui just like pygtk.
4
5Upstream-Status: Pending
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8---
9diff -u smart-1.4.1/smart.orig/fetcher.py smart-1.4.1/smart/fetcher.py
10--- smart-1.4.1/smart.orig/fetcher.py 2014-07-15 16:42:19.240437080 +0800
11+++ smart-1.4.1/smart/fetcher.py 2014-07-15 17:02:37.812470289 +0800
12@@ -1720,7 +1720,7 @@
13 handle.setopt(pycurl.OPT_FILETIME, 1)
14 handle.setopt(pycurl.LOW_SPEED_LIMIT, 1)
15 handle.setopt(pycurl.LOW_SPEED_TIME, SOCKETTIMEOUT)
16- handle.setopt(pycurl.NOPROGRESS, 0)
17+ handle.setopt(pycurl.NOPROGRESS, 1)
18 handle.setopt(pycurl.PROGRESSFUNCTION, progress)
19 handle.setopt(pycurl.WRITEDATA, local)
20 handle.setopt(pycurl.FOLLOWLOCATION, 1)
diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/meta/recipes-devtools/python/python-smartpm_git.bb
index 163461e592..8b974b0c33 100644
--- a/meta/recipes-devtools/python/python-smartpm_git.bb
+++ b/meta/recipes-devtools/python/python-smartpm_git.bb
@@ -22,6 +22,7 @@ SRC_URI = "\
22 file://smart-rpm4-fixes.patch \ 22 file://smart-rpm4-fixes.patch \
23 file://smart-add-for-rpm-ignoresize-check.patch \ 23 file://smart-add-for-rpm-ignoresize-check.patch \
24 file://smart-already-installed-message.patch \ 24 file://smart-already-installed-message.patch \
25 file://smart-set-noprogress-for-pycurl.patch \
25 " 26 "
26 27
27SRCREV = "407a7eca766431257dcd1da15175cc36a1bb22d0" 28SRCREV = "407a7eca766431257dcd1da15175cc36a1bb22d0"