From cd713a04e2fa7533881baa61e191508c245e0fae Mon Sep 17 00:00:00 2001 From: ophub <68696949+ophub@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:50:57 +0800 Subject: [PATCH] Adjust remake script naming --- README.cn.md | 20 ++++++++++---------- README.md | 20 ++++++++++---------- action.yml | 2 +- make => remake | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) rename make => remake (99%) diff --git a/README.cn.md b/README.cn.md index ab87699dd8..759c280349 100644 --- a/README.cn.md +++ b/README.cn.md @@ -114,7 +114,7 @@ sudo apt-get install -y $(curl -fsSL https://is.gd/depend_ubuntu2204_openwrt) ``` 2. Clone 仓库到本地 `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-openwrt.git` 3. 在 `~/amlogic-s9xxx-openwrt` 根目录下创建 `openwrt-armvirt` 文件夹, 并将 `openwrt-armvirt-64-default-rootfs.tar.gz` 文件上传至此目录。 -4. 在 `~/amlogic-s9xxx-openwrt` 根目录中输入打包命令,如 `sudo ./make -b s905x3 -k 6.1.10`。打包完成的 OpenWrt 固件放在根目录下的 `out` 文件夹里。 +4. 在 `~/amlogic-s9xxx-openwrt` 根目录中输入打包命令,如 `sudo ./remake -b s905x3 -k 6.1.10`。打包完成的 OpenWrt 固件放在根目录下的 `out` 文件夹里。 - ### 本地化打包参数说明 @@ -128,15 +128,15 @@ sudo apt-get install -y $(curl -fsSL https://is.gd/depend_ubuntu2204_openwrt) | -s | Size | 对系统的镜像分区大小进行设置,只设置 ROOTFS 分区大小时可以只指定一个数值,例如: `-s 1024`。需要同时设置 BOOTFS 和 ROOTFS 分区大小时,使用 / 对两个数值进行连接,例如: `-s 256/1024`。默认值:`256/1024` | | -n | BuilderName | 设置 OpenWrt 系统构建者签名。设置签名时请勿包含空格。默认值:`无` | -- `sudo ./make` : 使用默认配置,使用内核库中的最新内核包,对全部型号的电视盒子进行打包。 -- `sudo ./make -b s905x3 -k 6.1.10` : 推荐使用. 使用默认配置进行相关内核打包。 -- `sudo ./make -b s905x3 -k 6.1.y` : 使用默认配置进行相关内核打包,内核使用 6.1.y 系列的最新版。 -- `sudo ./make -b s905x3_s905d -k 6.1.10_5.15.50` : 使用默认配置,进行多个内核同时打包。使用 `_` 进行多内核参数连接。 -- `sudo ./make -b s905x3 -k 6.1.10 -s 1024` : 使用默认配置,指定一个内核,一个型号进行打包,固件大小设定为 1024 MiB。 -- `sudo ./make -b s905x3_s905d` 使用默认配置,对多个型号的电视盒子进行全部内核打包, 使用 `_` 进行多型号连接。 -- `sudo ./make -k 6.1.10_5.15.50` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。 -- `sudo ./make -k 6.1.10_5.15.50 -a true` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。 -- `sudo ./make -s 1024 -k 6.1.10` : 使用默认配置,设置固件大小为 1024 MiB, 并指定内核为 6.1.10 ,对全部型号电视盒子进行打包。 +- `sudo ./remake` : 使用默认配置,使用内核库中的最新内核包,对全部型号的电视盒子进行打包。 +- `sudo ./remake -b s905x3 -k 6.1.10` : 推荐使用. 使用默认配置进行相关内核打包。 +- `sudo ./remake -b s905x3 -k 6.1.y` : 使用默认配置进行相关内核打包,内核使用 6.1.y 系列的最新版。 +- `sudo ./remake -b s905x3_s905d -k 6.1.10_5.15.50` : 使用默认配置,进行多个内核同时打包。使用 `_` 进行多内核参数连接。 +- `sudo ./remake -b s905x3 -k 6.1.10 -s 1024` : 使用默认配置,指定一个内核,一个型号进行打包,固件大小设定为 1024 MiB。 +- `sudo ./remake -b s905x3_s905d` 使用默认配置,对多个型号的电视盒子进行全部内核打包, 使用 `_` 进行多型号连接。 +- `sudo ./remake -k 6.1.10_5.15.50` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。 +- `sudo ./remake -k 6.1.10_5.15.50 -a true` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。 +- `sudo ./remake -s 1024 -k 6.1.10` : 使用默认配置,设置固件大小为 1024 MiB, 并指定内核为 6.1.10 ,对全部型号电视盒子进行打包。 ## 使用 GitHub Actions 进行编译 diff --git a/README.md b/README.md index 967719537d..02a5afc6c7 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ sudo apt-get install -y $(curl -fsSL https://is.gd/depend_ubuntu2204_openwrt) ``` 2. Clone repository to local `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-openwrt.git` 3. In the root directory of `~/amlogic-s9xxx-openwrt`, create `openwrt-armvirt` folder, and upload the `openwrt-armvirt-64-default-rootfs.tar.gz` file to this directory. -4. Enter the packaging command in the root directory of `~/amlogic-s9xxx-openwrt`, such as `sudo ./make -b s905x3 -k 6.1.10`. The packaged OpenWrt firmware is placed in the `out` folder in the root directory. +4. Enter the packaging command in the root directory of `~/amlogic-s9xxx-openwrt`, such as `sudo ./remake -b s905x3 -k 6.1.10`. The packaged OpenWrt firmware is placed in the `out` folder in the root directory. - ### Explanation of Local Packaging Parameters @@ -128,15 +128,15 @@ sudo apt-get install -y $(curl -fsSL https://is.gd/depend_ubuntu2204_openwrt) | -s | Size | Set the size of the system's image partitions. When setting only the ROOTFS partition size, you can specify a single value, for example: `-s 1024`. When setting both BOOTFS and ROOTFS partition sizes, use / to connect the two values, for example: `-s 256/1024`. The default value is `256/1024` | | -n | BuilderName | Set the signature of the OpenWrt system builder. Do not include spaces when setting signatures. Default: `none` | -- `sudo ./make` : Use default configuration, use the latest kernel package in the kernel library, and package all models of TV boxes. -- `sudo ./make -b s905x3 -k 6.1.10` : Recommended. Use default configuration for related kernel packaging. -- `sudo ./make -b s905x3 -k 6.1.y` : Package the relevant kernels using the default configuration; the kernel utilizes the latest version of the 6.1.y series. -- `sudo ./make -b s905x3_s905d -k 6.1.10_5.15.50` : Use the default configuration and package multiple kernels at the same time. Use `_` to connect multiple kernel parameters. -- `sudo ./make -b s905x3 -k 6.1.10 -s 1024` : Use the default configuration, specify a kernel, a model for packaging, and set the firmware size to 1024 MiB. -- `sudo ./make -b s905x3_s905d` : Use default configuration, package all kernels for multiple models of TV boxes, use `_` to connect multiple models. -- `sudo ./make -k 6.1.10_5.15.50` : Use the default configuration, specify multiple kernels, package all models of TV boxes, and connect kernel packages with `_`. -- `sudo ./make -k 6.1.10_5.15.50 -a true` : Use the default configuration, specify multiple kernels, package all models of TV boxes, and connect kernel packages with `_`. Automatically upgrade to the latest kernel of the same series. -- `sudo ./make -s 1024 -k 6.1.10` : Use the default configuration, set the firmware size to 1024 MiB, and specify the kernel as 6.1.10 to package all models of TV boxes. +- `sudo ./remake` : Use default configuration, use the latest kernel package in the kernel library, and package all models of TV boxes. +- `sudo ./remake -b s905x3 -k 6.1.10` : Recommended. Use default configuration for related kernel packaging. +- `sudo ./remake -b s905x3 -k 6.1.y` : Package the relevant kernels using the default configuration; the kernel utilizes the latest version of the 6.1.y series. +- `sudo ./remake -b s905x3_s905d -k 6.1.10_5.15.50` : Use the default configuration and package multiple kernels at the same time. Use `_` to connect multiple kernel parameters. +- `sudo ./remake -b s905x3 -k 6.1.10 -s 1024` : Use the default configuration, specify a kernel, a model for packaging, and set the firmware size to 1024 MiB. +- `sudo ./remake -b s905x3_s905d` : Use default configuration, package all kernels for multiple models of TV boxes, use `_` to connect multiple models. +- `sudo ./remake -k 6.1.10_5.15.50` : Use the default configuration, specify multiple kernels, package all models of TV boxes, and connect kernel packages with `_`. +- `sudo ./remake -k 6.1.10_5.15.50 -a true` : Use the default configuration, specify multiple kernels, package all models of TV boxes, and connect kernel packages with `_`. Automatically upgrade to the latest kernel of the same series. +- `sudo ./remake -s 1024 -k 6.1.10` : Use the default configuration, set the firmware size to 1024 MiB, and specify the kernel as 6.1.10 to package all models of TV boxes. ## Use GitHub Actions for Compilation diff --git a/action.yml b/action.yml index a80d588070..012fffab40 100644 --- a/action.yml +++ b/action.yml @@ -80,7 +80,7 @@ runs: [[ -n "${{ inputs.auto_kernel }}" ]] && make_command="${make_command} -a ${{ inputs.auto_kernel }}" [[ -n "${{ inputs.openwrt_size }}" ]] && make_command="${make_command} -s ${{ inputs.openwrt_size }}" [[ -n "${{ inputs.builder_name }}" ]] && make_command="${make_command} -n ${{ inputs.builder_name }}" - sudo ./make ${make_command} + sudo ./remake ${make_command} cd ${GITHUB_ACTION_PATH}/${openwrt_outpath} # Generate a sha256sum verification file for each OpenWrt image file diff --git a/make b/remake similarity index 99% rename from make rename to remake index 19273bc079..20580ebcdc 100755 --- a/make +++ b/remake @@ -5,7 +5,7 @@ # License version 2. This program is licensed "as is" without any # warranty of any kind, whether express or implied. # -# This file is a part of the make OpenWrt +# This file is a part of the Remake OpenWrt # https://github.com/ophub/amlogic-s9xxx-openwrt # # Description: Automatically Packaged OpenWrt @@ -16,7 +16,7 @@ # Copyright (C) 2021~ https://github.com/ophub/amlogic-s9xxx-armbian/blob/main/CONTRIBUTORS.md # Copyright (C) 2020~ https://github.com/ophub/amlogic-s9xxx-openwrt # -# Command: sudo ./make +# Command: sudo ./remake # Command optional parameters please refer to the source code repository # #======================================== Functions list ========================================