diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 diff --git a/.gitmodules.gitee b/.gitmodules.gitee new file mode 100755 index 000000000..a79b97eb7 --- /dev/null +++ b/.gitmodules.gitee @@ -0,0 +1,3 @@ +[submodule "ubuntu"] + path = sysdrv/tools/board/ubuntu + url = https://gitee.com/eng-thirty-three/pico_ubuntu.git diff --git a/.gitmodules.github b/.gitmodules.github new file mode 100755 index 000000000..8cef09a0c --- /dev/null +++ b/.gitmodules.github @@ -0,0 +1,3 @@ +[submodule "ubuntu"] + path = sysdrv/tools/board/ubuntu + url = https://github.com/luckfox-eng33/pico_ubuntu.git diff --git a/project/build.sh b/project/build.sh index 64724f6af..53c20cd6f 100755 --- a/project/build.sh +++ b/project/build.sh @@ -1985,6 +1985,19 @@ fi export RK_PROJECT_TOOLCHAIN_CROSS=$RK_TOOLCHAIN_CROSS export PATH="${SDK_ROOT_DIR}/tools/linux/toolchain/${RK_PROJECT_TOOLCHAIN_CROSS}/bin":$PATH +if [[ "$LF_TARGET_ROOTFS" = "ubuntu" ]];then + if [[ "$LF_SUBMODULES_BY" = "github" ]];then + cp ${SDK_ROOT_DIR}/.gitmodules.github ${SDK_ROOT_DIR}/.gitmodules + else + if [[ "$LF_SUBMODULES_BY" = "gitee" ]];then + cp ${SDK_ROOT_DIR}/.gitmodules.gitee ${SDK_ROOT_DIR}/.gitmodules + else + exit 0 + fi + fi + git submodule update --init --recursive +fi + if echo $@|grep -wqE "help|-h"; then if [ -n "$2" -a "$(type -t usage$2)" == function ]; then echo "###Current Configure [ $2 ] Build Command###" diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico-IPC.mk index dc6a7d4b1..81402289b 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico-IPC.mk @@ -61,6 +61,9 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ # Target rootfs : ubuntu(only emmc)/buildroot/busybox export LF_TARGET_ROOTFS=ubuntu +# SUBMODULES : github/gitee +export LF_SUBMODULES_BY=github + # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk index 83225314b..edbdb39bd 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Mini_A-IPC.mk @@ -61,6 +61,9 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ # Target rootfs : ubuntu(only emmc)/buildroot/busybox export LF_TARGET_ROOTFS=ubuntu +# SUBMODULES : github/gitee +export LF_SUBMODULES_BY=github + # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk index f0190c403..98b12e9d9 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1103_Luckfox_Pico_Plus-IPC.mk @@ -61,6 +61,9 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ # Target rootfs : ubuntu(only emmc)/buildroot/busybox export LF_TARGET_ROOTFS=ubuntu +# SUBMODULES : github/gitee +export LF_SUBMODULES_BY=github + # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig diff --git a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk index 42219b070..2bbb7f53e 100755 --- a/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk +++ b/project/cfg/BoardConfig_IPC/BoardConfig-EMMC-Ubuntu-RV1106_Luckfox_Pico_Pro_Max-IPC.mk @@ -61,6 +61,9 @@ export RK_PARTITION_FS_TYPE_CFG=rootfs@IGNORE@ext4,userdata@/userdata@ext4,oem@/ # Target rootfs : ubuntu(only emmc)/buildroot/busybox export LF_TARGET_ROOTFS=ubuntu +# SUBMODULES : github/gitee +export LF_SUBMODULES_BY=github + # Buildroot defconfig export RK_BUILDROOT_DEFCONFIG=luckfox_pico_defconfig