diff --git a/.gitignore b/.gitignore index 4cdad0e6..e520813c 100644 --- a/.gitignore +++ b/.gitignore @@ -175,6 +175,7 @@ CMakeLists.txt !*/**/CMakeLists.txt tools/tmp/ tools/os/tmp/ +tools/os/tmp2/ tools/os/img_root/ tools/os/img_boot/ projects/apps/ diff --git a/maix/version.py b/maix/version.py index d0992bb6..b3f9dbeb 100644 --- a/maix/version.py +++ b/maix/version.py @@ -2,7 +2,7 @@ # Versions should comply with PEP440: https://peps.python.org/pep-0440/ version_major = 4 -version_minor = 7 -version_patch = 8 +version_minor = 8 +version_patch = 0 __version__ = "{}.{}.{}".format(version_major, version_minor, version_patch) diff --git a/projects/app_maixhub_client/app.yaml b/projects/app_maixhub_client/app.yaml index b1793ca2..2b9b1c2c 100644 --- a/projects/app_maixhub_client/app.yaml +++ b/projects/app_maixhub_client/app.yaml @@ -1,6 +1,6 @@ id: maixhub name: MaixHub Client -name: MaixHub 客户端 +name[zh]: MaixHub 客户端 version: 1.0.2 author: Sipeed icon: app.png diff --git a/projects/app_yolov8_seg/app.yaml b/projects/app_yolov8_seg/app.yaml index f0c839f5..a199a5e4 100644 --- a/projects/app_yolov8_seg/app.yaml +++ b/projects/app_yolov8_seg/app.yaml @@ -1,6 +1,6 @@ id: yolo11_seg name: YOLO11 Seg -name: YOLO11 分割 +name[zh]: YOLO11 分割 version: 1.0.2 author: Sipeed Ltd icon: icon.png diff --git a/tools/os/base_system_version.txt b/tools/os/base_system_version.txt index 10ec58ee..faec6b89 100644 --- a/tools/os/base_system_version.txt +++ b/tools/os/base_system_version.txt @@ -1 +1 @@ -20241021 \ No newline at end of file +20241129 \ No newline at end of file diff --git a/tools/os/gen_os.sh b/tools/os/gen_os.sh index ec3fca4c..10d04c54 100755 --- a/tools/os/gen_os.sh +++ b/tools/os/gen_os.sh @@ -141,6 +141,8 @@ if [ $board_name == "maixcam-pro" ]; then else cp "tmp/sys_builtin_files/boot/boards/board.maixcam" "tmp/sys_builtin_files/boot/board" fi +# 8.2 因为 boot分区不能拷贝文件夹,将 boards 文件夹拷贝到 /maixapp/boards,等第一次开机脚本复制到 boot 分区 +cp -r "tmp/sys_builtin_files/boot/boards" "tmp/sys_builtin_files/maixapp/" # 9. 拷贝 tmp/sys_builtin_files 生成新镜像,通过 ./update_img.sh tmp/sys_builtin_files tmp/os_version_str.img ./update_img.sh tmp/sys_builtin_files "tmp/$os_version_str.img"