Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
#locally computed
|
||||
sha256 9a66205d0ba3dff6dcc98119f104cd59c15855c6c030a190ca02354be52836c1 micropython-v1.9.4.tar.gz
|
||||
sha256 330cd32c7b67cb6b531d158eabcf68af3a7d7ad7b5a4b0ce3c73da3d241da6a2 micropython-1.12.tar.gz
|
||||
sha256 afde3432122205e8e08d615fcb920aca58631c52b6c0c01813854287a457b298 LICENSE
|
||||
|
||||
@@ -4,11 +4,16 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MICROPYTHON_VERSION = v1.9.4
|
||||
MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION))
|
||||
MICROPYTHON_VERSION = 1.12
|
||||
MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION))
|
||||
MICROPYTHON_LICENSE = MIT
|
||||
MICROPYTHON_LICENSE_FILES = LICENSE
|
||||
MICROPYTHON_DEPENDENCIES = host-pkgconf libffi
|
||||
MICROPYTHON_DEPENDENCIES = host-pkgconf libffi $(BR2_PYTHON3_HOST_DEPENDENCY)
|
||||
|
||||
# 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
|
||||
# have explicit support.
|
||||
@@ -22,15 +27,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)/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) \
|
||||
CROSS_COMPILE=$(TARGET_CROSS) \
|
||||
CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS)
|
||||
endef
|
||||
|
||||
define MICROPYTHON_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
|
||||
$(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \
|
||||
$(MICROPYTHON_MAKE_OPTS) \
|
||||
CROSS_COMPILE=$(TARGET_CROSS) \
|
||||
CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \
|
||||
|
||||
Reference in New Issue
Block a user