mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Damien George 2022-08-30 11:14:32 +10:00
parent 9a826e0f24
commit 730e975091
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/esp32/boards/manifest.py
View File

@ -6,3 +6,9 @@ freeze("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/uasyncio/manifest.py") include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
include("$(MPY_DIR)/extmod/webrepl/manifest.py") include("$(MPY_DIR)/extmod/webrepl/manifest.py")
include("$(MPY_DIR)/drivers/neopixel/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")

7
ports/esp32/boards/manifest_release.py
View File

@ -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")

7
tools/autobuild/build-boards.sh
View File

@ -83,12 +83,7 @@ function build_esp32_boards {
if idf.py --version | grep -q v4.2; then if idf.py --version | grep -q v4.2; then
if [ $mcu = esp32 ]; then if [ $mcu = esp32 ]; then
# build standard esp32-based boards with IDF v4.2 # build standard esp32-based boards with IDF v4.2
if echo $board_json | grep -q GENERIC; then build_board $board_json $fw_tag $dest_dir bin elf map
# 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
fi fi
else else
if [ $mcu != esp32 ]; then if [ $mcu != esp32 ]; then