Merge pull request #2592 from openmv/move_submodule
Some checks failed
🔎 Check Code Formatting / formatting-check (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_GIGA) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NANO_33_BLE_SENSE) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NANO_RP2040_CONNECT) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NICLA_VISION) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_PORTENTA_H7) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV2) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV3) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV4) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV4P) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMVPT) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV_RT1060) (push) Has been cancelled
🔥 Firmware Build / code-size-report (push) Has been cancelled
🔥 Firmware Build / stable-release (push) Has been cancelled
🔥 Firmware Build / development-release (push) Has been cancelled

micropython: Move submodule to lib.
This commit is contained in:
Ibrahim Abdelkader 2025-02-02 11:34:03 +02:00 committed by GitHub
commit 1962f4ba7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions

View File

@ -49,7 +49,7 @@ jobs:
!src/hal/**
!src/lib/**
!src/drivers/**
!src/micropython/**
!src/lib/micropython/**
!src/stm32cubeai/**
!src/omv/ports/stm32/uvc/**
!src/omv/ports/stm32/boot/**

2
.gitmodules vendored
View File

@ -1,5 +1,5 @@
[submodule "src/micropython"]
path = src/micropython
path = src/lib/micropython
url = https://github.com/openmv/micropython.git
branch = openmv
[submodule "src/omv/modules/ulab"]

View File

@ -32,7 +32,7 @@ STRIP = $(Q)arm-none-eabi-strip -s
OBJCOPY = $(Q)arm-none-eabi-objcopy
OBJDUMP = $(Q)arm-none-eabi-objdump
PYTHON = $(Q)python3
MKDFU = micropython/tools/dfu.py
MKDFU = $(MICROPY_DIR)/tools/dfu.py
PYDFU = $(Q)../tools/pydfu.py
MKDIR = $(Q)mkdir
ECHO = $(Q)@echo
@ -54,7 +54,7 @@ OMV_DIR=omv
BOOT_DIR=boot
CUBEAI_DIR=stm32cubeai
CMSIS_DIR=hal/cmsis
MICROPY_DIR=micropython
MICROPY_DIR=lib/micropython
GENX320_DIR=drivers/genx320
BOSON_DIR=drivers/boson
LEPTON_DIR=drivers/lepton

View File

@ -38,8 +38,8 @@ ci_install_gnu_make() {
ci_update_submodules() {
git submodule update --init --depth=1 --no-single-branch
git -C src/micropython/ submodule update --init --depth=1
# (cd src/micropython/ && for remote in `git branch -r | grep -v /HEAD | grep -v master`; do git checkout --track $remote ; done)
git -C src/lib/micropython/ submodule update --init --depth=1
# (cd src/lib/micropython/ && for remote in `git branch -r | grep -v /HEAD | grep -v master`; do git checkout --track $remote ; done)
}
########################################################################################
@ -47,7 +47,7 @@ ci_update_submodules() {
ci_build_target() {
export PATH=${GNU_MAKE_PATH}:${GCC_TOOLCHAIN_PATH}/bin:${PATH}
make -j$(nproc) -C src/micropython/mpy-cross
make -j$(nproc) -C src/lib/micropython/mpy-cross
make -j$(nproc) TARGET=${1} LLVM_PATH=${LLVM_TOOLCHAIN_PATH}/bin -C src
mv src/build/bin ${1}
}