micropython: bump version to v1.8.7

PATCH New Chris Packham 3 participants 8 messages Jan 24, 2017 – Jan 25, 2017

Share & tools

Chris Packham

author

2017-01-24 10:14 UTC #0 lore raw

PATCH 1/3 micropython: bump version to v1.8.7

The install step now requires CROSS_COMPILE as some C files are generated at install time. Also remove patches that have been applied upstream.

Signed-off-by Chris Packham <[email protected]>

---
 package/micropython/micropython.hash | 4 +---
 package/micropython/micropython.mk   | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

package/micropython/micropython.hash +1 -3

index 28c008d3b..6ab7b10b6 100644
@@ -1,4 +1,2 @@
 #locally computed
-sha256 871378fcf1f1042c399896d5673da67d12e1fb36c2e706af289fc959bc8f7a57  micropython-v1.8.3.tar.gz
-sha256 ff3194ebecda99023d7c1bb94d32b31b9491e95a79958a25ffd05213c5553acc  8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch
-sha256 ac19af8587211d7229074fefa1a3a3c0fe807babc7cf9ce53606f05958699448  a50b26e4b00ed094aa1ac74eac2fc2d8eb9ea1ed.patch
+sha256 55dd751c4c812809841fd06f4729b8341171c4b6c1dc28a9412455282554f8a5  micropython-v1.8.7.tar.gz

package/micropython/micropython.mk +3 -3

index 2f47ad899..8336fb436 100644
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-MICROPYTHON_VERSION = v1.8.3
+MICROPYTHON_VERSION = v1.8.7
 MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION))
 MICROPYTHON_LICENSE = MIT
 MICROPYTHON_LICENSE_FILES = LICENSE
 MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
-MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch \
-	https://github.com/micropython/micropython/commit/a50b26e4b00ed094aa1ac74eac2fc2d8eb9ea1ed.patch
 
 # Use fallback implementation for exception handling on architectures that don't
 # have explicit support.

@@ -33,6 +31,8 @@ endef
 define MICROPYTHON_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \
 		$(MICROPYTHON_MAKE_OPTS) \
+		CROSS_COMPILE=$(TARGET_CROSS) \
+		CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \
 		DESTDIR=$(TARGET_DIR) \
 		PREFIX=$(TARGET_DIR)/usr \
 		install

Signature · 1 line

2.11.0.24.ge6920cf

Chris Packham

author

2017-01-24 10:14 UTC #1 lore raw

PATCH 2/3 micropython-lib: depend on pcre

The micropython libs load libpcre dynamically using the foreign function interface (libffi). Without pcre the build will succeed but at run time anything that uses the 're' module will have issues.

Signed-off-by Chris Packham <[email protected]>

---
 package/micropython-lib/Config.in          | 1 +
 package/micropython-lib/micropython-lib.mk | 1 +
 2 files changed, 2 insertions(+)

package/micropython-lib/Config.in +1 -0

index a7e017be7..be8c87562 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MICROPYTHON_LIB
 	bool "micropython-lib"
+	select BR2_PACKAGE_PCRE
 	depends on BR2_PACKAGE_MICROPYTHON
 	help
 	  Core Python libraries ported to MicroPython.

package/micropython-lib/micropython-lib.mk +1 -0

index a0b533a53..478d6d690 100644
@@ -8,6 +8,7 @@ MICROPYTHON_LIB_VERSION = v1.8.2
 MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION))
 MICROPYTHON_LIB_LICENSE = Python software foundation license v2 (some modules), MIT (everything else)
 MICROPYTHON_LIB_LICENSE_FILES = LICENSE
+MICROPYTHON_LIB_DEPENDENCIES = pcre
 
 define MICROPYTHON_LIB_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \

Signature · 1 line

2.11.0.24.ge6920cf

Peter Korsgaard

2017-01-24 16:31 UTC #2 lore raw

PATCH 2/3 micropython-lib: depend on pcre

Quoted 5 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Chris" == Chris Packham <[email protected]> writes:
The micropython libs load libpcre dynamically using the foreign function interface (libffi). Without pcre the build will succeed but at run time anything that uses the 're' module will have issues.

Using 'depend on' in the subject is imho a bit confusing, as you are selecting it, so I reworded it a bit and committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

2017-01-24 20:54 UTC #3 lore raw

PATCH 2/3 micropython-lib: depend on pcre

In reply to Chris Packham

Hello,

Quoted 3 lines · Chris Packham

The micropython libs load libpcre dynamically using the foreign function interface (libffi). Without pcre the build will succeed but at run time anything that uses the 're' module will have issues.

If it's only a runtime dependency, then why do you have "MICROPYTHON_LIBS_DEPENDENCIES = pcre" ? Selecting it in Config.in is sufficient to ensure that it will be built "at some point" during the build. In such cases, we normally do just:

select BR2_PACKAGE_PCRE # runtime

and that's it.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Chris Packham

author

2017-01-25 07:13 UTC #4 lore raw

PATCH 2/3 micropython-lib: depend on pcre

Quoted 7 lines · Thomas Petazzoni

Hello,
Quoted 3 lines · Chris Packham
The micropython libs load libpcre dynamically using the foreign function interface (libffi). Without pcre the build will succeed but at run time anything that uses the 're' module will have issues.

Quoted 8 lines

If it's only a runtime dependency, then why do you have "MICROPYTHON_LIBS_DEPENDENCIES = pcre" ? Selecting it in Config.in is sufficient to ensure that it will be built "at some point" during the build. In such cases, we normally do just:
select BR2_PACKAGE_PCRE # runtime
and that's it.

Good point. I didn't look for any other examples of runtime dependencies. As Peter has already applied this one I'll send another to clarify that this is a runtime dependency and not a build time one.

Chris Packham

author

2017-01-24 10:14 UTC #5 lore raw

PATCH 3/3 micropython-lib: bump version to v1.8.6

In reply to Chris Packham

Signed-off-by Chris Packham <[email protected]>

---
 package/micropython-lib/micropython-lib.hash | 2 +-
 package/micropython-lib/micropython-lib.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/micropython-lib/micropython-lib.hash +1 -1

index fc1595a9c..bc0c22efc 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4f9250a93413c9925b912d54fe3aaee2d275c82bdb447fc07a090fc60287f5e8  micropython-lib-v1.8.2.tar.gz
+sha256 eb696009ff8c33004211e484649b34edb14f3efb2ff618942bc8888716757a55  micropython-lib-v1.8.6.tar.gz

package/micropython-lib/micropython-lib.mk +1 -1

index 478d6d690..8c8b1426f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROPYTHON_LIB_VERSION = v1.8.2
+MICROPYTHON_LIB_VERSION = v1.8.6
 MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION))
 MICROPYTHON_LIB_LICENSE = Python software foundation license v2 (some modules), MIT (everything else)
 MICROPYTHON_LIB_LICENSE_FILES = LICENSE

Signature · 1 line

2.11.0.24.ge6920cf

Peter Korsgaard

2017-01-24 16:31 UTC #6 lore raw

PATCH 3/3 micropython-lib: bump version to v1.8.6

Quoted 3 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Chris" == Chris Packham <[email protected]> writes:
Signed-off-by Chris Packham <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Peter Korsgaard

2017-01-24 16:31 UTC #7 lore raw

PATCH 1/3 micropython: bump version to v1.8.7

In reply to Chris Packham

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Chris" == Chris Packham <[email protected]> writes:
The install step now requires CROSS_COMPILE as some C files are generated at install time. Also remove patches that have been applied upstream.
Signed-off-by Chris Packham <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard