Skip to contentSkip to conversation

python-setuptools: bump to 40.1.0

PATCH New Adam Duskett 2 participants 3 messages Aug 20, 2018

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 2/2 python-setuptools: bump to 40.1.0

From: Adam Duskett <[email protected]>

With the introduction of Python 3.7.0, setuptools also needs to be updated. Without the update, several packages will fail to build or install with a

ValueError: bad marshal data (unknown type code). Updating setuptools to the latest version fixes this issue.

Fixes:
ded8c3a72e97c6e7481062ff601f1f03adab6976
5f659130a6a32a4c43d6ed2c3b559df77ae18249

Signed-off-by Adam Duskett <[email protected]>
---
 package/python-setuptools/python-setuptools.hash | 2 +-
 package/python-setuptools/python-setuptools.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/python-setuptools/python-setuptools.hash +1 -1
index f116a69..0e4c9ed 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  2599b4c452e77824bbd6da28d16b1fe8159c7a4c203d8d419d8b348fde7b9549  python-setuptools-v38.4.0.tar.gz
+sha256  a5ba2da485eb41ce83093452e29a6f7d2beaf03bca9c6fc69a901bffd0c34c4e  python-setuptools-v40.1.0.tar.gz
 sha256  c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a  LICENSE
package/python-setuptools/python-setuptools.mk +1 -1
index 004fc0d..590e982 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_SETUPTOOLS_VERSION = v38.4.0
+PYTHON_SETUPTOOLS_VERSION = v40.1.0
 PYTHON_SETUPTOOLS_SITE = $(call github,pypa,setuptools,$(PYTHON_SETUPTOOLS_VERSION))
 PYTHON_SETUPTOOLS_LICENSE = MIT
 PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH 2/2 kmod: bump to 25

From: Adam Duskett <[email protected]>

With the introduction of Python3.7.0, kmod needs to be bumped to version 25.

Fixes:
5ba7f2e9d0802890e275f7da160ad0aad87b6f56

Signed-off-by Adam Duskett <[email protected]>
---
 ....c-assert_cc-can-only-be-used-inside-func.patch | 56 ----------------------
 package/kmod/kmod.hash                             |  2 +-
 package/kmod/kmod.mk                               |  2 +-
 3 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch
package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch deleted +0 -56
deleted file mode 100644
index 09fe252..0000000
@@ -1,56 +0,0 @@
-From 7cd698eb31059012305d8bb7516577c8cd383e32 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sat, 3 Jun 2017 16:52:37 +0200
-Subject: [PATCH] shared/util.c: assert_cc() can only be used inside functions
-
-shared/macro.h has two versions of assert_cc, one that uses gcc
-_Static_assert(), which requires recent enough gcc versions, and one
-that uses a fake array to trigger a build error. The latter can only
-work inside functions, so assert_cc() should only be used inside
-functions.
-
-Fixes the following build failure when building kmod with old gcc
-versions such as gcc 4.3.x:
-
-shared/util.c:52: error: expected identifier or '(' before 'do'
-shared/util.c:52: error: expected identifier or '(' before 'while'
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- shared/util.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/shared/util.c b/shared/util.c
-index 9de080a..fd2028d 100644
---- a/shared/util.c
-+++ b/shared/util.c
-@@ -49,8 +49,6 @@ static const struct kmod_ext {
- 	{ }
- };
- 
--assert_cc(EAGAIN == EWOULDBLOCK);
--
- /* string handling functions and memory allocations                         */
- /* ************************************************************************ */
- 
-@@ -201,6 +199,8 @@ ssize_t read_str_safe(int fd, char *buf, size_t buflen)
- 	size_t todo = buflen - 1;
- 	size_t done = 0;
- 
-+	assert_cc(EAGAIN == EWOULDBLOCK);
-+
- 	do {
- 		ssize_t r = read(fd, buf + done, todo);
- 
-@@ -226,6 +226,8 @@ ssize_t write_str_safe(int fd, const char *buf, size_t buflen)
- 	size_t todo = buflen;
- 	size_t done = 0;
- 
-+	assert_cc(EAGAIN == EWOULDBLOCK);
-+
- 	do {
- 		ssize_t r = write(fd, buf + done, todo);
- 
--- 
-2.7.4
-
package/kmod/kmod.hash +1 -1
index be350c4..0e8f034 100644
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
-sha256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397  kmod-24.tar.xz
+sha256 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd  kmod-25.tar.xz
package/kmod/kmod.mk +1 -1
index 7c796ab..c165ea3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KMOD_VERSION = 24
+KMOD_VERSION = 25
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
 KMOD_INSTALL_STAGING = YES
Signature · 1 line
1.8.3.1
Applied
#2 lore raw

PATCH 2/2 kmod: bump to 25

Hello,

Quoted 7 lines · Adam Duskett

From: Adam Duskett <[email protected]>

With the introduction of Python3.7.0, kmod needs to be bumped to version 25.

Fixes:
5ba7f2e9d0802890e275f7da160ad0aad87b6f56

Please use the autobuilder URL here, for example:

http://autobuild.buildroot.net/results/5ba7f2e9d0802890e275f7da160ad0aad87b6f56/

Applied to next after fixing this.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com