diff options
| author | Damien George <damien@micropython.org> | 2022-08-30 11:14:32 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-08-30 11:34:34 +1000 |
| commit | 730e97509117ea9c8b527857c25f8a2bf04ecd86 (patch) | |
| tree | 3cfe7d9a69390b5cd0983e962bb5a0e37c61e28f | |
| parent | 9a826e0f24add1b7e719e915e0d4dde1c14b416e (diff) | |
esp32/boards: Merge manifest_release modules into standard manifest.
Having two separate manifests is confusing. It's simpler to have the daily
builds use the same configuration as the stable, release builds.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | ports/esp32/boards/manifest.py | 6 | ||||
| -rw-r--r-- | ports/esp32/boards/manifest_release.py | 7 | ||||
| -rwxr-xr-x | tools/autobuild/build-boards.sh | 7 |
3 files changed, 7 insertions, 13 deletions
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py index f0ed38b51..23252442e 100644 --- a/ports/esp32/boards/manifest.py +++ b/ports/esp32/boards/manifest.py @@ -6,3 +6,9 @@ freeze("$(MPY_DIR)/drivers/onewire") include("$(MPY_DIR)/extmod/uasyncio/manifest.py") include("$(MPY_DIR)/extmod/webrepl/manifest.py") include("$(MPY_DIR)/drivers/neopixel/manifest.py") + +# Freeze some micropython-lib modules. +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/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py deleted file mode 100644 index 8b9bcde6f..000000000 --- a/ports/esp32/boards/manifest_release.py +++ /dev/null @@ -1,7 +0,0 @@ -include("manifest.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/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh index b3d2f8c4c..48c7b8184 100755 --- a/tools/autobuild/build-boards.sh +++ b/tools/autobuild/build-boards.sh @@ -83,12 +83,7 @@ function build_esp32_boards { if idf.py --version | grep -q v4.2; then if [ $mcu = esp32 ]; then # build standard esp32-based boards with IDF v4.2 - if echo $board_json | grep -q GENERIC; then - # traditionally, GENERIC and GENERIC_SPIRAM boards used manifest_release.py - MICROPY_AUTOBUILD_MAKE="$MICROPY_AUTOBUILD_MAKE FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py" build_board $board_json $fw_tag $dest_dir bin elf map - else - build_board $board_json $fw_tag $dest_dir bin elf map - fi + build_board $board_json $fw_tag $dest_dir bin elf map fi else if [ $mcu != esp32 ]; then |