From db8704ecbd910e598fba4bc1817acf91d9da79e3 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 28 May 2021 00:09:34 +1000 Subject: [PATCH] esp8266,esp32: Update manifest to point to new dirs in micropython-lib. Following a refactoring of micropython-lib. Signed-off-by: Damien George --- ports/esp32/boards/manifest_release.py | 9 +++++---- ports/esp8266/boards/GENERIC/manifest.py | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py index b5c7cd111b..8b9bcde6ff 100644 --- a/ports/esp32/boards/manifest_release.py +++ b/ports/esp32/boards/manifest_release.py @@ -1,6 +1,7 @@ include("manifest.py") -freeze("$(MPY_LIB_DIR)/upysh", "upysh.py") -freeze("$(MPY_LIB_DIR)/urequests", "urequests.py") -freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py") -freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py") +freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py") + +freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py") +freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py") +freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py") diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py index 46f3b837be..9ce3ffe3aa 100644 --- a/ports/esp8266/boards/GENERIC/manifest.py +++ b/ports/esp8266/boards/GENERIC/manifest.py @@ -10,12 +10,12 @@ freeze("$(MPY_DIR)/drivers/display", "ssd1306.py") # Libraries from micropython-lib, include only if the library directory exists if os.path.isdir(convert_path("$(MPY_LIB_DIR)")): # file utilities - freeze("$(MPY_LIB_DIR)/upysh", "upysh.py") + freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py") # requests - freeze("$(MPY_LIB_DIR)/urequests", "urequests.py") - freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py") + freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py") + freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py") # umqtt - freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py") - freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py") + freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py") + freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")