Browse Source

package/micropython: drop patch

Drop patch and set GIT_DIR as suggested by upstream during review of an
upstreamable solution, see
https://github.com/micropython/micropython/pull/5002

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 5 years ago
parent
commit
e7e75d4c92
2 changed files with 8 additions and 25 deletions
  1. 0 22
      package/micropython/0001-fix-version.patch
  2. 8 3
      package/micropython/micropython.mk

+ 0 - 22
package/micropython/0001-fix-version.patch

@@ -1,22 +0,0 @@
-Always use the fallback behaviour for determining the version number
-
-When built from within buildroot the micropython build process detects
-that it is inside a git repository and ends up using the buildroot
-version number instead of the correct micropython version number.
-
-Signed-off-by: Chris Packham <judge.packham@gmail.com>
----
-diff -Naur micropython-v1.4.5-old/py/makeversionhdr.py micropython-v1.4.5/py/makeversionhdr.py
---- micropython-v1.4.5-old/py/makeversionhdr.py	2015-08-12 00:42:30.000000000 +1200
-+++ micropython-v1.4.5/py/makeversionhdr.py	2015-09-16 10:21:06.698962836 +1200
-@@ -70,9 +70,7 @@
- 
- def make_version_header(filename):
-     # Get version info using git, with fallback to docs/conf.py
--    info = get_version_info_from_git()
--    if info is None:
--        info = get_version_info_from_docs_conf()
-+    info = get_version_info_from_docs_conf()
- 
-     git_tag, git_hash, ver = info
- 

+ 8 - 3
package/micropython/micropython.mk

@@ -10,6 +10,11 @@ MICROPYTHON_LICENSE = MIT
 MICROPYTHON_LICENSE_FILES = LICENSE
 MICROPYTHON_LICENSE_FILES = LICENSE
 MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
 MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
 
 
+# Set GIT_DIR so package won't use buildroot's version number
+MICROPYTHON_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	GIT_DIR=.
+
 # Use fallback implementation for exception handling on architectures that don't
 # Use fallback implementation for exception handling on architectures that don't
 # have explicit support.
 # have explicit support.
 ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),)
 ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),)
@@ -22,15 +27,15 @@ MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0
 MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0
 MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0
 
 
 define MICROPYTHON_BUILD_CMDS
 define MICROPYTHON_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
+	$(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross
+	$(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
 		$(MICROPYTHON_MAKE_OPTS) \
 		$(MICROPYTHON_MAKE_OPTS) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS)
 		CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS)
 endef
 endef
 
 
 define MICROPYTHON_INSTALL_TARGET_CMDS
 define MICROPYTHON_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
+	$(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
 		$(MICROPYTHON_MAKE_OPTS) \
 		$(MICROPYTHON_MAKE_OPTS) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \
 		CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \