Skip to contentSkip to conversation

micropython: bump version to v1.9.3

PATCH New Blomme 2 participants 3 messages Apr 16, 2018

lore
Share & tools
lore

Blomme

#0 lore raw

PATCH 1/1 micropython: bump version to v1.9.3

(With correct formatting now)

The build step now requires building mpy-cross first.

Signed-off-by Blomme, Maarten <[email protected]>
---
 package/micropython-lib/micropython-lib.hash | 2 +-
 package/micropython-lib/micropython-lib.mk   | 2 +-
 package/micropython/micropython.hash         | 2 +-
 package/micropython/micropython.mk           | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)
package/micropython-lib/micropython-lib.hash +1 -1
index bc0c22efc5..f63c52cf0c 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 eb696009ff8c33004211e484649b34edb14f3efb2ff618942bc8888716757a55  micropython-lib-v1.8.6.tar.gz
+sha256 66e15380eb109613263beb6825b8eecb9191088270c1a59e8c7d922dd57183c7  micropython-lib-v1.9.3.tar.gz
package/micropython-lib/micropython-lib.mk +1 -1
index c9423feac6..3c46b92429 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROPYTHON_LIB_VERSION = v1.8.6
+MICROPYTHON_LIB_VERSION = v1.9.3
 MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION))
 MICROPYTHON_LIB_LICENSE = Python-2.0 (some modules), MIT (everything else)
 MICROPYTHON_LIB_LICENSE_FILES = LICENSE
package/micropython/micropython.hash +1 -1
index 6ab7b10b66..d42d7ee148 100644
@@ -1,2 +1,2 @@
 #locally computed
-sha256 55dd751c4c812809841fd06f4729b8341171c4b6c1dc28a9412455282554f8a5  micropython-v1.8.7.tar.gz
+sha256 ce6b5c4548e85d84075635ff3e94d5cd3356b5fcc7593a7b49dd513612b6ed01  micropython-v1.9.3.tar.gz
package/micropython/micropython.mk +4 -3
index 8336fb436f..2c6bddd81d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROPYTHON_VERSION = v1.8.7
+MICROPYTHON_VERSION = v1.9.3
 MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION))
 MICROPYTHON_LICENSE = MIT
 MICROPYTHON_LICENSE_FILES = LICENSE

@@ -22,14 +22,15 @@ MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0
 MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0
 
 define MICROPYTHON_BUILD_CMDS
-$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
 $(MICROPYTHON_MAKE_OPTS) \
 CROSS_COMPILE=$(TARGET_CROSS) \
 CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS)
 endef
 
 define MICROPYTHON_INSTALL_TARGET_CMDS
-$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
 $(MICROPYTHON_MAKE_OPTS) \
 CROSS_COMPILE=$(TARGET_CROSS) \
 CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \

--
2.13.6

________________________________

Notice to recipient: This email is meant for only the intended recipient of the transmission, and may be a communication privileged by law, subject to export control restrictions or that otherwise contains proprietary information. If you receive this email by mistake, please notify us immediately by replying to this message and then destroy it and do not review, disclose, copy or distribute it. Thank you in advance for your cooperation.

#1 lore raw

PATCH 1/1 micropython: bump version to v1.9.3

Hello Marteen,

Quoted 1 line · Maarten

(With correct formatting now)

Unfortunately no, the formatting is still not correct, because you didn't send with git send-email.

Quoted 8 lines

define MICROPYTHON_BUILD_CMDS
-$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross
+$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
$(MICROPYTHON_MAKE_OPTS) \
CROSS_COMPILE=$(TARGET_CROSS) \
CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS)
endef

The lines in this variable are indented in the current code, but are not in your patch. Hence the patch is broken.

There's a reason why everybody uses git send-email: because it does the right thing :-)

Thanks!

Thomas

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

PATCH 1/1 micropython: bump version to v1.9.3

In reply to Blomme

Hello,

Quoted 11 lines · Maarten

(With correct formatting now)

The build step now requires building mpy-cross first.

Signed-off-by Blomme, Maarten <[email protected]>
---
 package/micropython-lib/micropython-lib.hash | 2 +-
 package/micropython-lib/micropython-lib.mk   | 2 +-
 package/micropython/micropython.hash         | 2 +-
 package/micropython/micropython.mk           | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

I fixed up the breakage caused by your e-mail client or e-mail server, and applied. Sadly in the process I forgot to adjust your commit log to remove the "(With correct formatting now)" message, which shouldn't be part of the commit log. Such messages should be placed below the "---" marker after the Signed-off-by line. This way, they are part of the e-mail being sent, but not considered by git as a part of the commit log.

Thanks!

Thomas

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