changed to target release

GeCr1988 · Dec 14, 2018 · fda5e98 · fda5e98
1 parent 601f6c9
commit fda5e98
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/pycom-docker-fw-build/README.md b/pycom-docker-fw-build/README.md
@@ -16,11 +16,12 @@ If you have your MicroPython project in the current directory `.` just type:
 ```
 sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw  build LOPY4 myproject
 ```
-For building against a specific revision (ex:v1.20.0.rc0 idf_dev) you can use:
+For building against a specific revision (ex:v1.20.0.rc0 idf_v3.1) you can use:
 ```
-sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw  build LOPY4 myproject v1.20.0.rc0 idf_v3.1
+sudo docker run -v `pwd`:/opt/frozen -it goinvent/pycom-fw  build FIPY myproject v1.20.0.rc0 idf_v3.1
 ```
 
+
 ### note:
 
 The Frozen code implementation might not support sub-directories in MicroPython code.

diff --git a/pycom-docker-fw-build/assets/build b/pycom-docker-fw-build/assets/build
@@ -61,19 +61,13 @@ function build() {
   export IDF_PATH=/opt/pycom-esp-idf
   board=`echo "$BOARD" | tr '[:upper:]' '[:lower:]'`
   cd /opt/pycom-micropython-sigfox/esp32/ &&
-  make clean &&
-  make BOARD=$BOARD TARGET=boot_app &&
-  cp /opt/frozen/*.py /opt/pycom-micropython-sigfox/esp32/frozen/Custom/ &&
-  cd ../esp32/build/$BOARD/release &&
-  mkdir -p firmware_package &&
-  cd firmware_package/ &&
-  cp ../bootloader/bootloader.bin . &&
-  cp ../application.elf appimg.bin &&
-  cp ../lib/partitions.bin . &&
-  cat ../../../../tools/script | sed s/\"appimg.bin\"/\"${board}.bin\"/ > ./script;
-  cp ../$board.bin . &&
-  tar -czvf /opt/frozen/$board-firmware-$PROJECT.tar.gz script appimg.bin  bootloader.bin   partitions.bin $board.bin &&
-  echo "Firmware ready /opt/frozen/$board-firmware-$PROJECT.tar.gz"
+  make clean BOARD=$BOARD &&
+  cd ../mpy-cross && make clean && make && cd ../esp32  &&
+  cp /opt/frozen/*.py ./frozen/Base/ &&
+  mv ./frozen/Base/main.py ./frozen/Base/_main.py
+  make release BOARD=$BOARD RELEASE_DIR=/tmp
+  mv /tmp/*.tar.gz /opt/frozen/$board-firmware-$PROJECT.tar.gz
+  echo "Firmware $board-firmware-$PROJECT.tar.gz ready !"
 }
 
 [[ $boards =~ (^|[[:space:]])$1($|[[:space:]]) ]] &&