From b67900cbfa88a766fcd643a043b2e9af182bc698 Mon Sep 17 00:00:00 2001 From: ophub <68696949+ophub@users.noreply.github.com> Date: Wed, 8 Nov 2023 01:04:07 +0000 Subject: [PATCH] Add support for zcube1-max(rk3399) --- .github/workflows/packaging-openwrt.yml | 1 + README.cn.md | 3 ++- README.md | 3 ++- openwrt_flippy.sh | 7 +++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/packaging-openwrt.yml b/.github/workflows/packaging-openwrt.yml index e9ab431..97c406f 100644 --- a/.github/workflows/packaging-openwrt.yml +++ b/.github/workflows/packaging-openwrt.yml @@ -36,6 +36,7 @@ on: - s922x - s922x-n2 - vplus + - zcube1-max - diy openwrt_kernel: description: "Select kernel version" diff --git a/README.cn.md b/README.cn.md index 661763a..2be5909 100644 --- a/README.cn.md +++ b/README.cn.md @@ -32,7 +32,7 @@ | KERNEL_REPO_URL | breakings/OpenWrt | 设置内核下载仓库的 `/`,默认从 breakings 维护的[内核 Releases](https://github.com/breakings/OpenWrt/releases/tag/kernel_stable)里下载。 | | KERNEL_VERSION_NAME | 6.1.1_5.15.1 | 设置[内核版本](https://github.com/breakings/OpenWrt/releases/tag/kernel_stable),可以查看并选择指定。可指定单个内核如 `6.1.1` ,可选择多个内核用`_`连接如 `6.1.1_5.15.1` | | KERNEL_AUTO_LATEST | true | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `KERNEL_VERSION_NAME` 中指定的内核如 `6.1.1` 的同系列是否有更新的版本,如有更新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。 | -| PACKAGE_SOC | all | 设置打包盒子的 `SOC` ,默认 `all` 打包全部盒子,可指定单个盒子如 `s905x3` ,可选择多个盒子用`_`连接如 `s905x3_s905d` 。各盒子的SoC代码为:`vplus`, `cm3`, `beikeyun`, `l1pro`, `rock5b`, `r66s`, `r68s`, `e25`, `photonicat`, `watermelon-pi`, `s905`, `s905d`, `s905x2`, `s905x3`, `s912`, `s922x`, `s922x-n2`, `qemu`, `diy`。说明:`s922x-n2` 是 `s922x-odroid-n2`, `diy` 是自定义盒子。 | +| PACKAGE_SOC | all | 设置打包盒子的 `SOC` ,默认 `all` 打包全部盒子,可指定单个盒子如 `s905x3` ,可选择多个盒子用`_`连接如 `s905x3_s905d` 。各盒子的SoC代码为:`vplus`, `cm3`, `beikeyun`, `l1pro`, `rock5b`, `r66s`, `r68s`, `e25`, `photonicat`, `watermelon-pi`, `zcube1-max`, `s905`, `s905d`, `s905x2`, `s905x3`, `s912`, `s922x`, `s922x-n2`, `qemu`, `diy`。说明:`s922x-n2` 是 `s922x-odroid-n2`, `diy` 是自定义盒子。 | | GZIP_IMGS | auto | 设置打包完毕后文件压缩的格式,可选值 `.gz`(默认) / `.xz` / `.zip` / `.zst` / `.7z` | | SELECT_PACKITPATH | openwrt_packit | 设置 `/opt` 下的打包目录名称 | | SELECT_OUTPUTPATH | output | 设置 `${SELECT_PACKITPATH}` 目录中固件输出的目录名称 | @@ -40,6 +40,7 @@ | SCRIPT_CM3 | mk_rk3566_radxa-cm3-rpi-cm4-io.sh | 设置打包 `rk3566 radxa-cm3-rpi-cm4-io` 的脚本文件名 | | SCRIPT_BEIKEYUN | mk_rk3328_beikeyun.sh | 设置打包 `rk3328 beikeyun` 的脚本文件名 | | SCRIPT_L1PRO | mk_rk3328_l1pro.sh | 设置打包 `rk3328 l1pro` 的脚本文件名 | +| SCRIPT_ZCUBE1MAX | mk_rk3399_zcube1-max.sh | 设置打包 `rk3399 zcube1-max` 的脚本文件名 | | SCRIPT_ROCK5B | mk_rk3588_rock5b.sh | 设置打包 `rk3588 rock5b` 的脚本文件名 | | SCRIPT_R66S | mk_rk3568_r66s.sh | 设置打包 `rk3568 r66s` 的脚本文件名 | | SCRIPT_R68S | mk_rk3568_r68s.sh | 设置打包 `rk3568 r68s` 的脚本文件名 | diff --git a/README.md b/README.md index 8dc2cac..aa01aa3 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Based on the latest kernel packaging scripts released by `Flippy`, optional para | KERNEL_REPO_URL | breakings/OpenWrt | Set `/` of the kernel download repository, it downloads from the [kernel Releases](https://github.com/breakings/OpenWrt/releases/tag/kernel_stable) maintained by breakings by default. | | KERNEL_VERSION_NAME | 6.1.1_5.15.1 | Set the [Kernel version](https://github.com/breakings/OpenWrt/releases/tag/kernel_stable), you can check and select a specific one. You can specify a single kernel such as `6.1.1`, or select multiple kernels connected with `_` like `6.1.1_5.15.1` | | KERNEL_AUTO_LATEST | true | Set whether to automatically adopt the latest version kernel of the same series. When set to `true`, it will automatically look for whether there is an updated version of the kernel specified in `KERNEL_VERSION_NAME`, such as `6.1.1`, in the kernel library, and if there is an updated version, it will automatically replace it with the latest version. When set to `false`, it will compile the specified version kernel. | -| PACKAGE_SOC | all | Set the `SOC` of the package box, the default is `all` to package all boxes, you can specify a single box like `s905x3`, or select multiple boxes connected with `_` like `s905x3_s905d`. The SoC codes for each box are: `vplus`, `cm3`, `beikeyun`, `l1pro`, `rock5b`, `r66s`, `r68s`, `e25`, `photonicat`, `watermelon-pi`, `s905`, `s905d`, `s905x2`, `s905x3`, `s912`, `s922x`, `s922x-n2`, `qemu`, `diy`. Note: `s922x-n2` is `s922x-odroid-n2`, `diy` is a custom box. | +| PACKAGE_SOC | all | Set the `SOC` of the package box, the default is `all` to package all boxes, you can specify a single box like `s905x3`, or select multiple boxes connected with `_` like `s905x3_s905d`. The SoC codes for each box are: `vplus`, `cm3`, `beikeyun`, `l1pro`, `rock5b`, `r66s`, `r68s`, `e25`, `photonicat`, `watermelon-pi`, `zcube1-max`, `s905`, `s905d`, `s905x2`, `s905x3`, `s912`, `s922x`, `s922x-n2`, `qemu`, `diy`. Note: `s922x-n2` is `s922x-odroid-n2`, `diy` is a custom box. | | GZIP_IMGS | auto | Set the format of the file compression after packaging, optional values are `.gz` (default) / `.xz` / `.zip` / `.zst` / `.7z` | | SELECT_PACKITPATH | openwrt_packit | Set the name of the packaging directory under `/opt` | | SELECT_OUTPUTPATH | output | Set the name of the firmware output directory in the `${SELECT_PACKITPATH}` directory | @@ -40,6 +40,7 @@ Based on the latest kernel packaging scripts released by `Flippy`, optional para | SCRIPT_CM3 | mk_rk3566_radxa-cm3-rpi-cm4-io.sh | Set the script filename for packaging `rk3566 radxa-cm3-rpi-cm4-io` | | SCRIPT_BEIKEYUN | mk_rk3328_beikeyun.sh | Set the script filename for packaging `rk3328 beikeyun` | | SCRIPT_L1PRO | mk_rk3328_l1pro.sh | Set the script filename for packaging `rk3328 l1pro` | +| SCRIPT_ZCUBE1MAX | mk_rk3399_zcube1-max.sh | Set the script filename for packaging `rk3399 zcube1-max` | | SCRIPT_ROCK5B | mk_rk3588_rock5b.sh | Set the script filename for packaging `rk3588 rock5b` | | SCRIPT_R66S | mk_rk3568_r66s.sh | Set the script filename for packaging `rk3568 r66s` | | SCRIPT_R68S | mk_rk3568_r68s.sh | Set the script filename for packaging `rk3568 r68s` | diff --git a/openwrt_flippy.sh b/openwrt_flippy.sh index 34af228..cd80199 100755 --- a/openwrt_flippy.sh +++ b/openwrt_flippy.sh @@ -29,7 +29,7 @@ PACKAGE_FILE="openwrt-armvirt-64-generic-rootfs.tar.gz" # Set the list of supported device PACKAGE_OPENWRT=( "rock5b" - "r66s" "r68s" "e25" "photonicat" "cm3" + "r66s" "r68s" "e25" "photonicat" "cm3" "zcube1-max" "watermelon-pi" "beikeyun" "l1pro" "vplus" @@ -43,7 +43,7 @@ PACKAGE_OPENWRT_RK3588=("rock5b") # Devices from the rk3528/rk3566/rk3568 series can utilize the rk35xx and rk3588 kernels. PACKAGE_OPENWRT_RK35XX=("watermelon-pi") # Set the list of devices using the [ 6.x.y ] kernel -PACKAGE_OPENWRT_KERNEL6=("r66s" "r68s" "e25" "photonicat" "cm3") +PACKAGE_OPENWRT_KERNEL6=("r66s" "r68s" "e25" "photonicat" "cm3" "zcube1-max") # All are packaged by default, and independent settings are supported, such as: [ s905x3_s905d_rock5b ] PACKAGE_SOC_VALUE="all" @@ -66,6 +66,7 @@ SAVE_OPENWRT_ARMVIRT_VALUE="true" SCRIPT_VPLUS_FILE="mk_h6_vplus.sh" SCRIPT_BEIKEYUN_FILE="mk_rk3328_beikeyun.sh" SCRIPT_L1PRO_FILE="mk_rk3328_l1pro.sh" +SCRIPT_ZCUBE1MAX_FILE="mk_rk3399_zcube1-max.sh" SCRIPT_CM3_FILE="mk_rk3566_radxa-cm3-rpi-cm4-io.sh" SCRIPT_R66S_FILE="mk_rk3568_r66s.sh" SCRIPT_R68S_FILE="mk_rk3568_r68s.sh" @@ -132,6 +133,7 @@ init_var() { [[ -n "${SCRIPT_VPLUS}" ]] || SCRIPT_VPLUS="${SCRIPT_VPLUS_FILE}" [[ -n "${SCRIPT_BEIKEYUN}" ]] || SCRIPT_BEIKEYUN="${SCRIPT_BEIKEYUN_FILE}" [[ -n "${SCRIPT_L1PRO}" ]] || SCRIPT_L1PRO="${SCRIPT_L1PRO_FILE}" + [[ -n "${SCRIPT_ZCUBE1MAX}" ]] || SCRIPT_ZCUBE1MAX="${SCRIPT_ZCUBE1MAX_FILE}" [[ -n "${SCRIPT_CM3}" ]] || SCRIPT_CM3="${SCRIPT_CM3_FILE}" [[ -n "${SCRIPT_R66S}" ]] || SCRIPT_R66S="${SCRIPT_R66S_FILE}" [[ -n "${SCRIPT_R68S}" ]] || SCRIPT_R68S="${SCRIPT_R68S_FILE}" @@ -464,6 +466,7 @@ EOF vplus) [[ -f "${SCRIPT_VPLUS}" ]] && sudo ./${SCRIPT_VPLUS} ;; beikeyun) [[ -f "${SCRIPT_BEIKEYUN}" ]] && sudo ./${SCRIPT_BEIKEYUN} ;; l1pro) [[ -f "${SCRIPT_L1PRO}" ]] && sudo ./${SCRIPT_L1PRO} ;; + zcube1-max) [[ -f "${SCRIPT_ZCUBE1MAX}" ]] && sudo ./${SCRIPT_ZCUBE1MAX} ;; cm3) [[ -f "${SCRIPT_CM3}" ]] && sudo ./${SCRIPT_CM3} ;; r66s) [[ -f "${SCRIPT_R66S}" ]] && sudo ./${SCRIPT_R66S} ;; r68s) [[ -f "${SCRIPT_R68S}" ]] && sudo ./${SCRIPT_R68S} ;;