Skip to content

Commit ae7db57

Browse files
committed
fix gen_os script errror
1 parent 47d6527 commit ae7db57

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/release_maixcam.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
python download_base_os.py -o ${base_os_path}
8888
python download_builtin_files.py --unzip tmp/dl_builtin_files
8989
builtin_files_dir=tmp/dl_builtin_files/sys_builtin_files
90-
./gen_os.sh $base_os_path $release_path $builtin_files_dir
90+
./gen_os.sh $base_os_path $release_path $builtin_files_dir 0 maixcam
9191
os_filename=${os_version_name}.img.xz
9292
os_filepath=`pwd`/images/$os_filename
9393
sha256sum $release_path >> ${maixpy_path}/sha256sum_files.txt

docs/doc/zh/pro/compile_os.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ title: 为 MaixCAM 编译系统
3131

3232
`MaixPy/tools/os`目录下,执行
3333
```shell
34-
./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> [skip_build_apps] [device_name]
34+
./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> <skip_build_apps> <device_name>
3535
```
3636
这里参数说明:
3737
* **base_os_filepath**: 基础系统路径, img 或者 img.xz 格式。
3838
* **maixpy_whl_filepath**: MaixPy 软件包, whl 格式。
3939
* **builtin_files_dir_path**: MaixCAM 自定义文件, 可以在 MaixPy release 下载到最新的。
4040
* **os_version_str**: 系统版本,格式要满足类似 `maixcam-2024-08-16-maixpy-v4.4.21` 的规范。
41-
* **skip_build_apps**: 跳过编译内置应用,可选参数,传 1 则会跳过,不传这个参数会将 MaixCDK 和 MaixPy 中的应用都编译并拷贝到系统中。
42-
* * **device name**: 可以选择`maixcam` 或者 `maixcam-pro`,对应了设备的型号。
41+
* **skip_build_apps**: 跳过编译内置应用,可选参数,传 `1` 则会跳过,`0` 会将 MaixCDK 和 MaixPy 中的应用都编译并拷贝到系统中。
42+
* **device name**: 可以选择`maixcam` 或者 `maixcam-pro`,对应了设备的型号。
4343

4444
举例:
4545
```shell

maix/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
version_major = 4
55
version_minor = 11
6-
version_patch = 1
6+
version_patch = 2
77

88
__version__ = "{}.{}.{}".format(version_major, version_minor, version_patch)

tools/os/maixcam/gen_os.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set -x
1515

1616
function usage() {
1717
echo "Usage:"
18-
echo " ./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> [skip_build_apps] [board_name] [delete_first_files]"
18+
echo " ./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> <skip_build_apps> <board_name> [delete_first_files]"
1919
echo "skip_build_apps can be 0 or 1"
2020
echo "board_name can be maixcam or maixcam-pro"
2121
echo "delete_first_files before copy new builtin files, delete some files, one line one item, format same with command rm,"

tools/os/maixcam2/gen_os.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414

1515
function usage() {
1616
echo "Usage:"
17-
echo " ./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> [skip_build_apps] [board_name] [delete_first_files]"
17+
echo " ./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> <skip_build_apps> <board_name> [delete_first_files]"
1818
echo "skip_build_apps can be 0 or 1"
1919
echo "board_name can be maixcam or maixcam-pro"
2020
echo "delete_first_files before copy new builtin files, delete some files, one line one item, format same with command rm,"

0 commit comments

Comments
 (0)