From ea3ea1ffcf684a87dde65f967188828efa6cc073 Mon Sep 17 00:00:00 2001 From: NonPIayerCharacter <18557343+NonPIayerCharacter@users.noreply.github.com> Date: Mon, 15 Sep 2025 14:17:52 +0300 Subject: [PATCH] Use cache in workflows (#1793) * Cache gcc * cache esp32 toolchains * skip --- .github/workflows/workflow.yaml | 111 ++++++++++++++++++++++---------- Makefile | 75 ++++++++++----------- requirements.txt | 2 + 3 files changed, 113 insertions(+), 75 deletions(-) create mode 100644 requirements.txt diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index e219644fa..bff6add79 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -162,10 +162,13 @@ jobs: variant: default - platform: OpenXR809 variant: default + gcc: 8-2019-q3 - platform: OpenXR806 variant: default + gcc: 8-2019-q3 - platform: OpenXR872 variant: default + gcc: 8-2019-q3 - platform: OpenBL602 variant: default - platform: OpenW800 @@ -174,16 +177,21 @@ jobs: variant: default - platform: OpenLN882H variant: default + gcc: 10.3-2021.10 - platform: OpenTR6260 variant: default - platform: OpenRTL8710A variant: default + gcc: 8-2019-q3 - platform: OpenRTL8710B variant: default + gcc: 8-2019-q3 - platform: OpenRTL87X0C variant: default + gcc: apt - platform: OpenRTL8720D variant: default + gcc: 10.3-2021.10 - platform: OpenECR6600 variant: default @@ -210,10 +218,6 @@ jobs: variant: irRemoteESP - platform: OpenBK7231N variant: sensors - - # extras for BK7238 - - platform: OpenBK7238 - variant: irRemoteESP - platform: OpenBL602 variant: berry @@ -223,18 +227,28 @@ jobs: - name: Source checkout uses: actions/checkout@v4 - uses: actions/setup-python@v5 + if: ${{ matrix.platform == 'OpenBL602' }} with: - python-version: '3.8' + python-version: '3.10' architecture: 'x64' + cache: 'pip' - name: Install dependencies + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: cmake + version: 1.0 + - name: Install arm-none-eabi-gcc + if: ${{ matrix.gcc && matrix.gcc != 'apt' }} + uses: carlosperate/arm-none-eabi-gcc-action@v1 + with: + release: ${{ matrix.gcc }} + path-env-var: ARM_NONE_EABI_GCC_PATH + - name: Install arm-none-eabi-gcc + if: ${{ matrix.gcc == 'apt' }} run: | - sudo dpkg --add-architecture i386 + curl -sL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh | sudo bash sudo apt-get update - sudo apt-get -y install libc6-i386 make cmake - pip3 install pycryptodomex - pip3 install configobj - pip3 install toml - pip3 install fdt + sudo apt-fast install -y gcc-arm-none-eabi - run: ls -la - name: Run make run: make APP_VERSION=${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }} APP_NAME=${{ matrix.platform }} VARIANT="${{ matrix.variant }}" ${{ matrix.platform }} @@ -268,25 +282,35 @@ jobs: include: - platform: OpenESP32C2 variant: 2M + version: v5.5.1 - platform: OpenESP32C3 variant: 2M + version: v5.5.1 - platform: OpenESP32 variant: 4M + version: v5.5.1 - platform: OpenESP32C2 variant: 4M + version: v5.5.1 - platform: OpenESP32C3 variant: 4M + version: v5.5.1 - platform: OpenESP32C6 variant: 4M + version: v5.5.1 - platform: OpenESP32S3 variant: 4M + version: v5.5.1 - platform: OpenESP32S2 variant: 4M + version: v5.5.1 - platform: OpenESP32C5 variant: 4M + version: v5.5.1 - platform: OpenESP32C61 variant: 4M + version: v5.5.1 steps: - name: Source checkout uses: actions/checkout@v4 @@ -295,25 +319,32 @@ jobs: with: repository: espressif/esp-idf path: sdk/esp-idf - ref: v5.5.1 + ref: ${{ matrix.version }} submodules: recursive - uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.10' architecture: 'x64' + cache: 'pip' - name: Install dependencies + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: cmake + version: 1.0 + - name: Cache toolchain + id: cache-toolchain + uses: actions/cache@v4 + with: + path: ~/.espressif # cache whole folder, not just dist + key: ESP-IDF_toolchain_${{ matrix.version }} + - name: Get toolchain + if: steps.cache-toolchain.outputs.cache-hit != 'true' run: | - sudo apt-get update - sudo apt-get -y install make cmake python3-venv - pip3 install pycryptodomex - pip3 install configobj - pip3 install toml - pip3 install fdt - pip3 install esptool + cd sdk/esp-idf + ./install.sh - name: Run make run: | cd sdk/esp-idf - ./install.sh > /dev/null . ./export.sh . ./add_path.sh cd ../.. @@ -404,35 +435,45 @@ jobs: # default for all platforms - platform: OpenBK7231N_ALT variant: default + gcc: apt - platform: OpenBK7231T_ALT variant: default + gcc: apt - platform: OpenBK7231U variant: default + gcc: apt - platform: OpenBK7238 variant: default + gcc: apt - platform: OpenBK7252 variant: default + gcc: apt - platform: OpenBK7252N variant: default + gcc: apt + # extras for BK7238 - platform: OpenBK7238 variant: berry + gcc: apt + - platform: OpenBK7238 + variant: irRemoteESP + gcc: apt steps: - name: Source checkout uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - name: Install arm-none-eabi-gcc + if: ${{ matrix.gcc && matrix.gcc != 'apt' }} + uses: carlosperate/arm-none-eabi-gcc-action@v1 with: - python-version: '3.8' - architecture: 'x64' - - name: Install dependencies + release: ${{ matrix.gcc }} + path-env-var: ARM_NONE_EABI_GCC_PATH + - name: Install arm-none-eabi-gcc + if: ${{ matrix.gcc == 'apt' }} run: | - sudo dpkg --add-architecture i386 + curl -sL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh | sudo bash sudo apt-get update - sudo apt-get -y install libc6-i386 make - pip3 install pycryptodomex - pip3 install configobj - pip3 install toml - pip3 install fdt + sudo apt-fast install -y gcc-arm-none-eabi - run: ls -la - name: Run make run: make APP_VERSION=${{ needs.refs.outputs.version }}${{ matrix.variant != 'default' && '_' || '' }}${{ matrix.variant != 'default' && matrix.variant || '' }} APP_NAME=${{ matrix.platform }} VARIANT="${{ matrix.variant }}" ${{ matrix.platform }} @@ -477,10 +518,14 @@ jobs: with: python-version: '3.10' architecture: 'x64' + cache: 'pip' + - name: Install dependencies + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: cmake + version: 1.0 - name: Install dependencies run: | - sudo apt-get update - sudo apt-get -y install make cmake python3-venv pip install -r sdk/ameba-rtos/tools/requirements.txt mkdir /opt/rtk-toolchain cd /opt/rtk-toolchain diff --git a/Makefile b/Makefile index 82484445a..57eb2280f 100644 --- a/Makefile +++ b/Makefile @@ -80,12 +80,6 @@ endif berry: berry_init @[ "$(shell diff -rq libraries/berry/generate libraries/berry/temp)" ] && (echo "[Prebuild berry] regenerate resources" && cp -r libraries/berry/temp/* libraries/berry/generate) || echo "[Prebuild berry] resources are not different" -.PHONY: actions_gcc -actions_gcc: -ifdef GITHUB_ACTIONS - [ -z `dpkg -l | grep gcc-arm-none-eabi` ] && sudo apt-get install gcc-arm-none-eabi -endif - # Create symlink for App into SDK folder structure sdk/OpenBK7231T/apps/$(APP_NAME): @echo Create symlink for $(APP_NAME) into sdk folder @@ -155,6 +149,9 @@ prebuild_OpenBK7231T: berry fi prebuild_OpenBL602: berry +ifdef GITHUB_ACTIONS + pip3 install fdt toml configobj pycryptodomex +endif git submodule update --init --recursive --depth=1 sdk/OpenBL602 @if [ -e platforms/BL602/pre_build.sh ]; then \ echo "prebuild found for OpenBL602"; \ @@ -162,7 +159,7 @@ prebuild_OpenBL602: berry else echo "prebuild for OpenBL602 not found ... "; \ fi -prebuild_OpenLN882H: berry actions_gcc +prebuild_OpenLN882H: berry git submodule update --init --recursive --depth=1 sdk/OpenLN882H @if [ -e platforms/LN882H/pre_build.sh ]; then \ echo "prebuild found for OpenLN882H"; \ @@ -246,7 +243,7 @@ prebuild_OpenTR6260: berry else echo "prebuild for OpenTR6260 not found ... "; \ fi -prebuild_OpenRTL87X0C: berry actions_gcc +prebuild_OpenRTL87X0C: berry git submodule update --init --recursive --depth=1 sdk/OpenRTL87X0C @if [ -e platforms/RTL87X0C/pre_build.sh ]; then \ echo "prebuild found for OpenRTL87X0C"; \ @@ -254,7 +251,7 @@ prebuild_OpenRTL87X0C: berry actions_gcc else echo "prebuild for OpenRTL87X0C not found ... "; \ fi -prebuild_OpenRTL8710B: berry actions_gcc +prebuild_OpenRTL8710B: berry git submodule update --init --recursive --depth=1 sdk/OpenRTL8710A_B @if [ -e platforms/RTL8710B/pre_build.sh ]; then \ echo "prebuild found for OpenRTL8710B"; \ @@ -266,7 +263,7 @@ prebuild_OpenRTL8710B: berry actions_gcc else g++ -o platforms/RTL8710B/tools/amebaz_ota_combine platforms/RTL8710B/tools/amebaz_ota_combine.cpp --std=c++17 -lstdc++fs; \ fi -prebuild_OpenRTL8710A: berry actions_gcc +prebuild_OpenRTL8710A: berry git submodule update --init --recursive --depth=1 sdk/OpenRTL8710A_B @if [ -e platforms/RTL8710A/pre_build.sh ]; then \ echo "prebuild found for OpenRTL8710A"; \ @@ -274,7 +271,7 @@ prebuild_OpenRTL8710A: berry actions_gcc else echo "prebuild for OpenRTL8710A not found ... "; \ fi -prebuild_OpenRTL8720D: berry actions_gcc +prebuild_OpenRTL8720D: berry git submodule update --init --recursive --depth=1 sdk/OpenRTL8720D @if [ -e platforms/RTL8720D/pre_build.sh ]; then \ echo "prebuild found for OpenRTL8720D"; \ @@ -282,7 +279,7 @@ prebuild_OpenRTL8720D: berry actions_gcc else echo "prebuild for OpenRTL8720D not found ... "; \ fi -prebuild_OpenBK7238: berry actions_gcc +prebuild_OpenBK7238: berry git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk @if [ -e platforms/BK723x/pre_build_7238.sh ]; then \ echo "prebuild found for OpenBK7238"; \ @@ -290,7 +287,7 @@ prebuild_OpenBK7238: berry actions_gcc else echo "prebuild for OpenBK7238 not found ... "; \ fi -prebuild_OpenBK7231N_ALT: berry actions_gcc +prebuild_OpenBK7231N_ALT: berry git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk @if [ -e platforms/BK723x/pre_build_7231n.sh ]; then \ echo "prebuild found for OpenBK7231N"; \ @@ -298,7 +295,7 @@ prebuild_OpenBK7231N_ALT: berry actions_gcc else echo "prebuild for OpenBK7231N not found ... "; \ fi -prebuild_OpenBK7231U: berry actions_gcc +prebuild_OpenBK7231U: berry git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk @if [ -e platforms/BK723x/pre_build_7231u.sh ]; then \ echo "prebuild found for OpenBK7231U"; \ @@ -306,7 +303,7 @@ prebuild_OpenBK7231U: berry actions_gcc else echo "prebuild for OpenBK7231U not found ... "; \ fi -prebuild_OpenBK7231T_ALT: berry actions_gcc +prebuild_OpenBK7231T_ALT: berry git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk @if [ -e platforms/BK723x/pre_build_7231t.sh ]; then \ echo "prebuild found for OpenBK7231T"; \ @@ -314,7 +311,7 @@ prebuild_OpenBK7231T_ALT: berry actions_gcc else echo "prebuild for OpenBK7231T not found ... "; \ fi -prebuild_OpenBK7252: berry actions_gcc +prebuild_OpenBK7252: berry git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk @if [ -e platforms/BK723x/pre_build_7252.sh ]; then \ echo "prebuild found for OpenBK7252"; \ @@ -322,7 +319,7 @@ prebuild_OpenBK7252: berry actions_gcc else echo "prebuild for OpenBK7252 not found ... "; \ fi -prebuild_OpenBK7252N: berry actions_gcc +prebuild_OpenBK7252N: berry git submodule update --init --recursive --depth=1 sdk/beken_freertos_sdk @if [ -e platforms/BK723x/pre_build_7252n.sh ]; then \ echo "prebuild found for OpenBK7252N"; \ @@ -376,40 +373,34 @@ OpenBK7231N: prebuild_OpenBK7231N if [ ! -d "$(MBEDTLS)" ]; then wget -q "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v2.28.5.tar.gz"; tar -xf v2.28.5.tar.gz -C output; rm -f v2.28.5.tar.gz; mv $(MBEDTLS)/library/base64.c $(MBEDTLS)/library/base64_mbedtls.c; fi $(MAKE) APP_NAME=OpenBK7231N TARGET_PLATFORM=bk7231n SDK_PATH=sdk/OpenBK7231N APPS_BUILD_PATH=../bk7231n_os OBK_VARIANT=$(OBK_VARIANT) build-BK7231 -sdk/OpenXR809/tools/gcc-arm-none-eabi-4_9-2015q1: - git submodule update --init --depth=1 sdk/OpenBK7231T - -sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4: - if [ ! -e sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4 ]; then cd sdk/OpenXR806/tools && wget -q "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v8.3.1-1.4/xpack-arm-none-eabi-gcc-8.3.1-1.4-linux-x64.tar.gz" && tar -xf *.tar.gz && rm -f *.tar.gz; fi - .PHONY: OpenXR872 -OpenXR872: prebuild_OpenXR872 sdk/OpenXR872/project/demo/hello_demo/shared sdk/OpenXR809/tools/gcc-arm-none-eabi-4_9-2015q1 - $(MAKE) -C sdk/OpenXR872/src CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR872/src install CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc image CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc image_xz CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory +OpenXR872: prebuild_OpenXR872 sdk/OpenXR872/project/demo/hello_demo/shared + $(MAKE) -C sdk/OpenXR872/src CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR872/src install CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc image CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc image_xz CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory mkdir -p output/$(APP_VERSION) cp sdk/OpenXR872/project/demo/hello_demo/image/xr872/xr_system.img output/$(APP_VERSION)/OpenXR872_$(APP_VERSION).img cp sdk/OpenXR872/project/demo/hello_demo/image/xr872/xr_system_img_xz.img output/$(APP_VERSION)/OpenXR872_$(APP_VERSION)_ota.img .PHONY: OpenXR806 -OpenXR806: prebuild_OpenXR806 sdk/OpenXR806/project/demo/sharedApp/shared sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4 - $(MAKE) -C sdk/OpenXR806/src CC_DIR=$(PWD)/sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR806/src install CC_DIR=$(PWD)/sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc CC_DIR=$(PWD)/sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image CC_DIR=$(PWD)/sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory - $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image_xz CC_DIR=$(PWD)/sdk/OpenXR806/tools/xpack-arm-none-eabi-gcc-8.3.1-1.4/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory +OpenXR806: prebuild_OpenXR806 sdk/OpenXR806/project/demo/sharedApp/shared + $(MAKE) -C sdk/OpenXR806/src CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR806/src install CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory + $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image_xz CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory mkdir -p output/$(APP_VERSION) cp sdk/OpenXR806/project/demo/sharedApp/image/xr806/xr_system.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION).img cp sdk/OpenXR806/project/demo/sharedApp/image/xr806/xr_system_img_xz.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION)_ota.img .PHONY: OpenXR809 -OpenXR809: prebuild_OpenXR809 sdk/OpenXR809/project/oxr_sharedApp/shared sdk/OpenXR809/tools/gcc-arm-none-eabi-4_9-2015q1 - $(MAKE) -C sdk/OpenXR809/src CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc) - $(MAKE) -C sdk/OpenXR809/src install CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc) - $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc) - $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc image CC_DIR=$(PWD)/sdk/OpenBK7231T/platforms/bk7231t/toolchain/gcc-arm-none-eabi-4_9-2015q1/bin APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory +OpenXR809: prebuild_OpenXR809 sdk/OpenXR809/project/oxr_sharedApp/shared + $(MAKE) -C sdk/OpenXR809/src CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc) + $(MAKE) -C sdk/OpenXR809/src install CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc) + $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc) + $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc image CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory mkdir -p output/$(APP_VERSION) cp sdk/OpenXR809/project/oxr_sharedApp/image/xr809/xr_system.img output/$(APP_VERSION)/OpenXR809_$(APP_VERSION).img @@ -455,8 +446,8 @@ OpenW600: prebuild_OpenW600 sdk/OpenW600/tools/gcc-arm-none-eabi-4_9-2015q1/bin .PHONY: OpenLN882H OpenLN882H: prebuild_OpenLN882H sdk/OpenLN882H/project/OpenBeken/app - CROSS_TOOLCHAIN_ROOT="/usr/" APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) cmake sdk/OpenLN882H -B sdk/OpenLN882H/build - CROSS_TOOLCHAIN_ROOT="/usr/" APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) cmake --build ./sdk/OpenLN882H/build -j $(shell nproc) + CROSS_TOOLCHAIN_ROOT=$(ARM_NONE_EABI_GCC_PATH)/../ APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) cmake sdk/OpenLN882H -B sdk/OpenLN882H/build + CROSS_TOOLCHAIN_ROOT=$(ARM_NONE_EABI_GCC_PATH)/../ APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) cmake --build ./sdk/OpenLN882H/build -j $(shell nproc) mkdir -p output/$(APP_VERSION) cp sdk/OpenLN882H/build/bin/flashimage.bin output/$(APP_VERSION)/OpenLN882H_$(APP_VERSION).bin cp sdk/OpenLN882H/build/bin/flashimage-ota-xz-v0.1.bin output/$(APP_VERSION)/OpenLN882H_$(APP_VERSION)_OTA.bin diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..9c18f7be8 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +virtualenv +esptool