Skip to content

Commit 30a02f1

Browse files
simbit18simbit18
committed
update esptool version and switch Wget to cURL tool
add --depth 1 update esptool
1 parent c3c7292 commit 30a02f1

File tree

9 files changed

+22
-16
lines changed

9 files changed

+22
-16
lines changed

‎.github/workflows/nuttx_arm64.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
9292
ls -a
9393
cp nuttx nuttxarm64/nuttx
94+
cp .config nuttxarm64/.config
9495
cp defconfig nuttxarm64/defconfig
9596
cp System.map nuttxarm64/System.map
9697
zip -r nuttxarm64.zip nuttxarm64

‎.github/workflows/nuttx_esp32.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
cd nuttxspace
5555
## git clone https://github.com/apache/incubator-nuttx nuttx
5656
## git clone https://github.com/apache/incubator-nuttx-apps apps
57-
git clone --depth 1 --single-branch --branch simbit18-20240306 https://github.com/simbit18/nuttx.git nuttx
58-
git clone --depth 1 --single-branch --branch simbit18-20240306 https://github.com/simbit18/nuttx-apps.git apps
57+
git clone --single-branch --branch simbit18-20240306 https://github.com/simbit18/nuttx.git nuttx
58+
git clone --single-branch --branch simbit18-20240306 https://github.com/simbit18/nuttx-apps.git apps
5959
## curl -L https://www.apache.org/dyn/closer.lua/nuttx/12.0.0/apache-nuttx-12.0.0.tar.gz?action=download -o nuttx.tar.gz
6060
## curl -L https://www.apache.org/dyn/closer.lua/nuttx/12.0.0/apache-nuttx-apps-12.0.0.tar.gz?action=download -o apps.tar.gz
6161
## tar zxf nuttx.tar.gz --one-top-level=nuttx --strip-components 1
@@ -67,8 +67,8 @@ jobs:
6767
# Awaiting official release 4.8 !!!
6868
# https://github.com/espressif/esptool/actions/runs/9301686672
6969
# v4.8.dev4
70-
mkdir -p tools/esptool
71-
cp -fr ../tools/esptool tools
70+
# mkdir -p tools/esptool
71+
# cp -fr ../tools/esptool tools
7272
## ls -a tools/esptool
7373
cp -f ../tools/esp32/install_tools_esp.sh install_tools_esp.sh
7474
## ls -a
@@ -113,6 +113,7 @@ jobs:
113113
cp nuttx.merged.bin nuttxesp32/nuttx.merged.bin
114114
cp nuttx.bin nuttxesp32/nuttx.bin
115115
cp defconfig nuttxesp32/defconfig
116+
cp .config nuttxesp32/.config
116117
cp System.map nuttxesp32/System.map
117118
zip -r nuttxesp32.zip nuttxesp32
118119

‎.github/workflows/nuttx_esp32_openeth.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jobs:
107107
cp nuttx.merged.bin nuttxesp32/nuttx.merged.bin
108108
cp nuttx.bin nuttxesp32/nuttx.bin
109109
cp defconfig nuttxesp32/defconfig
110+
cp .config nuttxesp32/.config
110111
cp System.map nuttxesp32/System.map
111112
zip -r nuttxesp32.zip nuttxesp32
112113

‎.github/workflows/nuttx_rvvirt.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
ls -a
9393
cp nuttx nuttxrvvirt/nuttx
9494
cp defconfig nuttxrvvirt/defconfig
95+
cp .config nuttxrvvirt/.config
9596
cp System.map nuttxrvvirt/System.map
9697
zip -r nuttxrvvirt.zip nuttxrvvirt
9798

‎.github/workflows/nuttx_rvvirt_cmake.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
ls -a build
9898
cp build/nuttx nuttxrvvirt/nuttx
9999
cp build/defconfig nuttxrvvirt/defconfig
100+
cp build/.config nuttxrvvirt/.config
100101
## cp System.map nuttxrvvirt/System.map
101102
zip -r nuttxrvvirt.zip nuttxrvvirt
102103

‎.github/workflows/nuttx_rvvirt_knsh32.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
ls -a
9393
cp nuttx nuttxrvvirt/nuttx
9494
cp defconfig nuttxrvvirt/defconfig
95+
cp .config nuttxrvvirt/.config
9596
cp System.map nuttxrvvirt/System.map
9697
zip -r nuttxrvvirt_knsh.zip nuttxrvvirt
9798

‎tools/arm64/install_tools_arm64.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ arm64_gcc_toolchain() {
4040
basefile=arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-aarch64-none-elf
4141
cd "${NUTTXTOOLS}"
4242
# Download the latest ARM64 GCC toolchain prebuilt by ARM
43-
wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.zip
43+
curl -O -L https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.zip
4444
unzip -qo ${basefile}.zip
4545
mv ${basefile} gcc-aarch64-none-elf
4646
rm ${basefile}.zip
@@ -53,7 +53,7 @@ gen_romfs() {
5353
add_path "${NUTTXTOOLS}"/genromfs/usr/bin
5454

5555
if ! type genromfs > /dev/null 2>&1; then
56-
git clone https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
56+
git clone --depth 1 https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
5757
cd "${NUTTXTOOLS}"/nuttx-tools
5858
tar zxf genromfs-0.5.2.tar.gz
5959
cd genromfs-0.5.2
@@ -67,7 +67,7 @@ kconfig_frontends() {
6767
add_path "${NUTTXTOOLS}"/kconfig-frontends/bin
6868

6969
if [ ! -f "${NUTTXTOOLS}/kconfig-frontends/bin/kconfig-conf" ]; then
70-
git clone https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
70+
git clone --depth 1 https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
7171
cd "${NUTTXTOOLS}"/nuttx-tools/kconfig-frontends
7272
./configure --prefix="${NUTTXTOOLS}"/kconfig-frontends \
7373
--enable-mconf --disable-kconfig --disable-nconf --disable-qconf \

‎tools/esp32/install_tools_esp.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ esp_tool() {
8686

8787
if ! type esptool > /dev/null 2>&1; then
8888
local basefile
89-
basefile=esptool-v4.7.0-win64
89+
basefile=esptool-v4.8.0-win64
9090
cd "${NUTTXTOOLS}"
91-
curl -O -L -s https://github.com/espressif/esptool/releases/download/v4.7.0/${basefile}.zip
91+
curl -O -L -s https://github.com/espressif/esptool/releases/download/v4.8.0/${basefile}.zip
9292
unzip -qo ${basefile}.zip
9393
mv esptool-win64 esp-tool
9494
rm ${basefile}.zip
@@ -112,7 +112,7 @@ gen_romfs() {
112112
add_path "${NUTTXTOOLS}"/genromfs/usr/bin
113113

114114
if ! type genromfs > /dev/null 2>&1; then
115-
git clone https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
115+
git clone --depth 1 https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
116116
cd "${NUTTXTOOLS}"/nuttx-tools
117117
tar zxf genromfs-0.5.2.tar.gz
118118
cd genromfs-0.5.2
@@ -126,7 +126,7 @@ kconfig_frontends() {
126126
add_path "${NUTTXTOOLS}"/kconfig-frontends/bin
127127

128128
if [ ! -f "${NUTTXTOOLS}/kconfig-frontends/bin/kconfig-conf" ]; then
129-
git clone https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
129+
git clone --depth 1 https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
130130
cd "${NUTTXTOOLS}"/nuttx-tools/kconfig-frontends
131131
./configure --prefix="${NUTTXTOOLS}"/kconfig-frontends \
132132
--enable-mconf --disable-kconfig --disable-nconf --disable-qconf \
@@ -168,7 +168,7 @@ install_build_tools() {
168168
mkdir -p "${NUTTXTOOLS}"
169169
echo "#!/usr/bin/env sh" > "${NUTTXTOOLS}"/env.sh
170170

171-
install="xtensa_esp32_blobs esp_tool_dev gen_romfs kconfig_frontends rust xtensa_esp32_gcc_toolchain"
171+
install="xtensa_esp32_blobs esp_tool gen_romfs kconfig_frontends rust xtensa_esp32_gcc_toolchain"
172172

173173
oldpath=$(cd . && pwd -P)
174174
for func in ${install}; do

‎tools/rv-virt/install_tools_rvvirt.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ arm64_gcc_toolchain() {
4040
basefile=arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-aarch64-none-elf
4141
cd "${NUTTXTOOLS}"
4242
# Download the latest ARM64 GCC toolchain prebuilt by ARM
43-
wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.zip
43+
curl -O -L https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.zip
4444
unzip -qo ${basefile}.zip
4545
mv ${basefile} gcc-aarch64-none-elf
4646
rm ${basefile}.zip
@@ -53,7 +53,7 @@ gen_romfs() {
5353
add_path "${NUTTXTOOLS}"/genromfs/usr/bin
5454

5555
if ! type genromfs > /dev/null 2>&1; then
56-
git clone https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
56+
git clone --depth 1 https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
5757
cd "${NUTTXTOOLS}"/nuttx-tools
5858
tar zxf genromfs-0.5.2.tar.gz
5959
cd genromfs-0.5.2
@@ -67,7 +67,7 @@ kconfig_frontends() {
6767
add_path "${NUTTXTOOLS}"/kconfig-frontends/bin
6868

6969
if [ ! -f "${NUTTXTOOLS}/kconfig-frontends/bin/kconfig-conf" ]; then
70-
git clone https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
70+
git clone --depth 1 https://bitbucket.org/nuttx/tools.git "${NUTTXTOOLS}"/nuttx-tools
7171
cd "${NUTTXTOOLS}"/nuttx-tools/kconfig-frontends
7272
./configure --prefix="${NUTTXTOOLS}"/kconfig-frontends \
7373
--enable-mconf --disable-kconfig --disable-nconf --disable-qconf \
@@ -89,7 +89,7 @@ riscv_gcc_toolchain() {
8989
basefile=xpack-riscv-none-elf-gcc-13.2.0-2-win32-x64
9090
cd "${NUTTXTOOLS}"
9191
# Download the latest RISCV GCC toolchain prebuilt by xPack
92-
wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/${basefile}.zip
92+
curl -O -L https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/${basefile}.zip
9393
unzip -qo ${basefile}.zip
9494
mv xpack-riscv-none-elf-gcc-13.2.0-2 riscv-none-elf-gcc
9595
rm ${basefile}.zip

0 commit comments

Comments
 (0)