Skip to contentSkip to conversation

python-psutil: bump to version 5.2.0

PATCH New Baruch Siach 2 participants 3 messages Mar 12, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 python-psutil: bump to version 5.2.0

Cc Peter Korsgaard <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/python-psutil/python-psutil.hash | 4 ++--
 package/python-psutil/python-psutil.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/python-psutil/python-psutil.hash +2 -2
index c0b795b855b7..19fb8a4fdb67 100644
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed
-md5	3090e32d42761086ae82036cadb95ba3  psutil-5.1.3.tar.gz
-sha256  959bd58bdc8152b0a143cb3bd822d4a1b8f7230617b0e3eb2ff6e63812120f2b  psutil-5.1.3.tar.gz
+md5	c9aa2599dcd9e5b59d71b6660d396062  psutil-5.2.0.tar.gz
+sha256  2fc91d068faa5613c093335f0e758673ef8c722ad4bfa4aded64c13ae69089eb  psutil-5.2.0.tar.gz
package/python-psutil/python-psutil.mk +2 -2
index 2bb865d7419b..978373368a37 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PSUTIL_VERSION = 5.1.3
+PYTHON_PSUTIL_VERSION = 5.2.0
 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/0a/aa90434c6337dd50d182a81fe4ae4822c953e166a163d1bf5f06abb1ac0b
+PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/3c/2f/f3ab91349c666f009077157b12057e613a3152a46a6c3be883777546b6de
 PYTHON_PSUTIL_SETUP_TYPE = setuptools
 PYTHON_PSUTIL_LICENSE = BSD-3c
 PYTHON_PSUTIL_LICENSE_FILES = LICENSE
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 python-psutil: enable musl build

The sysinfo.h header conflict issue is now fixed since upstream commit c414ecd9b9151 ("Fix build with musl libc"). Enable build with musl. Enable reverse dependencies as well.

Cc Peter Korsgaard <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/circus/Config.in          | 4 +---
 package/python-crossbar/Config.in | 5 ++---
 package/python-psutil/Config.in   | 5 -----
 3 files changed, 3 insertions(+), 11 deletions(-)
package/circus/Config.in +1 -3
index 5276513076ca..f1cd93c73396 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CIRCUS
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq
-	depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
 	select BR2_PACKAGE_PYTHON_IOWAIT # runtime
 	select BR2_PACKAGE_PYTHON_PSUTIL # runtime
 	select BR2_PACKAGE_PYTHON_PYZMQ # runtime

@@ -15,7 +14,6 @@ config BR2_PACKAGE_CIRCUS
 
 	  https://circus.readthedocs.org/en/latest/
 
-comment "circus needs Python and a uClibc or glibc toolchain w/ C++, threads"
+comment "circus needs Python and a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-		BR2_TOOLCHAIN_USES_MUSL || \
 		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
package/python-crossbar/Config.in +2 -3
index 7ef1aadbc9d8..be8332515ec2 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_CROSSBAR
 	bool "python-crossbar"
-	depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
 	# All the following dependencies are runtime dependencies
 	select BR2_PACKAGE_PYTHON_AUTOBAHN
 	select BR2_PACKAGE_PYTHON_CBOR

@@ -40,5 +39,5 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 
 	  https://pypi.python.org/pypi/crossbar
 
-comment "python-crossbar needs a uClibc or glibc toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL
+comment "python-crossbar needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
package/python-psutil/Config.in +0 -5
index 1aec35d27411..c64eeeed6472 100644
@@ -1,13 +1,8 @@
 config BR2_PACKAGE_PYTHON_PSUTIL
 	bool "python-psutil"
-	# sys/sysinfo.h conflict with kernel headers
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  psutil is a cross-platform library for retrieving
 	  information on running processes and system utilization
 	  (CPU, memory, disks, network) in Python.
 
 	  https://pypi.python.org/pypi/psutil
-
-comment "python-psutil needs a uClibc or glibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 python-psutil: bump to version 5.2.0

In reply to Baruch Siach

Hello,

Quoted 6 lines · Baruch Siach
Cc Peter Korsgaard <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/python-psutil/python-psutil.hash | 4 ++--
 package/python-psutil/python-psutil.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Both applied to master, thanks! And thanks a lot for following up on the musl issue for this package, re-enabling it and its reverse dependencies when possible. Definitely nice.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com