From b407eb597af09fb214f55c11f03cfe05214b0eb2 Mon Sep 17 00:00:00 2001 From: ophub Date: Wed, 8 Dec 2021 11:44:19 +0800 Subject: [PATCH] Adjust the default firmware to bullseye --- .github/workflows/build-armbian.yml | 6 +++--- .github/workflows/rebuild-armbian.yml | 19 ++++++++++++++++-- .../workflows/use-releases-file-to-build.yml | 19 ++++++++++++++++-- README.cn.md | 20 +++++++++---------- README.md | 20 +++++++++---------- rebuild | 4 ++-- recompile | 2 +- 7 files changed, 60 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml index 7b1d2c1732..e1056bbec5 100644 --- a/.github/workflows/build-armbian.yml +++ b/.github/workflows/build-armbian.yml @@ -10,9 +10,9 @@ on: workflow_dispatch: inputs: set_release: - description: "RELEASE: buster / focal" + description: "RELEASE: bullseye / focal" required: false - default: "buster" + default: "bullseye" set_board: description: "BOARD: lepotato / odroidn2" required: false @@ -52,7 +52,7 @@ jobs: if [[ -n "${{ github.event.inputs.set_release }}" && -n "$(echo "${ARR_RELEASE[@]}" | grep -w "${{ github.event.inputs.set_release }}")" ]]; then set_release="${{ github.event.inputs.set_release }}" else - set_release="buster" + set_release="bullseye" fi echo "ARMBIAN_RELEASE=${set_release}" >> $GITHUB_ENV diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml index 47707a089e..44fcea08cb 100644 --- a/.github/workflows/rebuild-armbian.yml +++ b/.github/workflows/rebuild-armbian.yml @@ -40,11 +40,13 @@ jobs: sudo timedatectl set-timezone "$TZ" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir + + # Get the url of the rebuild armbian file if [[ -n "${{ github.event.inputs.armbian_url }}" ]]; then armbian_url="${{ github.event.inputs.armbian_url }}" else armbian_down="https://armbian.tnahosting.net/dl/lepotato/archive/" - armbian_file=$(curl -s ${armbian_down} | grep -oE Armbian.*buster.*.img.xz | head -n 1) + armbian_file=$(curl -s ${armbian_down} | grep -oE Armbian.*bullseye.*.img.xz | head -n 1) if [ -n "${armbian_file}" ]; then armbian_url="${armbian_down}/${armbian_file}" else @@ -55,6 +57,19 @@ jobs: echo "ARMBIAN_URL=${armbian_url}" >> $GITHUB_ENV echo "COMPILE_STARTINGTIME=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV + # Get the release name of the rebuild armbian file + set_release="_" + ARR_RELEASE=("bionic" "focal" "hirsute" "bullseye" "buster" "stretch") + i=1 + for r in ${ARR_RELEASE[*]}; do + if [[ "${armbian_url}" == *${r}* ]]; then + set_release="_${r}_" + break + fi + let i++ + done + echo "ARMBIAN_RELEASE=${set_release}" >> $GITHUB_ENV + - name: Rebuild Armbian for Amlogic s9xxx uses: ophub/amlogic-s9xxx-armbian@main with: @@ -73,7 +88,7 @@ jobs: uses: ncipollo/release-action@v1 if: env.PACKAGED_STATUS == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() with: - tag: Armbian_Aml_${{ env.PACKAGED_OUTPUTDATE }} + tag: Armbian_Aml${{ env.ARMBIAN_RELEASE }}${{ env.PACKAGED_OUTPUTDATE }} artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/* allowUpdates: true token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml index 16b9659013..44439e8eb3 100644 --- a/.github/workflows/use-releases-file-to-build.yml +++ b/.github/workflows/use-releases-file-to-build.yml @@ -42,7 +42,22 @@ jobs: [ -d build/output/images ] || mkdir -p build/output/images curl -s "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases" | grep -o "Armbian_Aml_.*/Armbian_.*-trunk_.*.img.gz" | head -n 1 > DOWNLOAD_ARMBIAN [ -s DOWNLOAD_ARMBIAN ] && wget -q -P build/output/images https://github.com/${GITHUB_REPOSITORY}/releases/download/$(cat DOWNLOAD_ARMBIAN) - cd build/output/images/ && gzip -df *.img.gz && sync && cd ../../../ + cd build/output/images/ && gzip -df *.img.gz && sync + + set_release="_" + out_releasename=$(ls -l *-trunk_* 2>/dev/null | awk '{print $9}' | head -n 1) + ARR_RELEASE=("bionic" "focal" "hirsute" "bullseye" "buster" "stretch") + i=1 + for r in ${ARR_RELEASE[*]}; do + if [[ "${out_releasename}" == *${r}* ]]; then + set_release="_${r}_" + break + fi + let i++ + done + echo "ARMBIAN_RELEASE=${set_release}" >> $GITHUB_ENV + + cd ${GITHUB_ACTION_PATH} sudo chmod +x rebuild sudo ./rebuild -d -b s922x_s922x-n2_s905x3_s905x2_s905d_s912_s912-t95z -k 5.10.80_5.4.160 sudo ./rebuild -d -b s905x_s905w -k 5.4.160 @@ -62,7 +77,7 @@ jobs: uses: ncipollo/release-action@v1 if: steps.rebuild.outputs.status == 'success' && env.UPLOAD_RELEASE == 'true' && !cancelled() with: - tag: Armbian_Aml_${{ env.FILE_DATE }} + tag: Armbian_Aml${{ env.ARMBIAN_RELEASE }}${{ env.FILE_DATE }} artifacts: ${{ env.FILEPATH }}/* allowUpdates: true token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.cn.md b/README.cn.md index d356b64df9..859eae3d78 100644 --- a/README.cn.md +++ b/README.cn.md @@ -10,13 +10,13 @@ | 型号 | 盒子 | [可选内核](https://github.com/ophub/kernel/tree/main/pub/stable) | Armbian 固件 | | ---- | ---- | ---- | ---- | -| s922x | [Belink](https://tokopedia.link/RAgZmOM41db), [Belink-Pro](https://tokopedia.link/sfTHlfS41db), [Ugoos-AM6-Plus](https://tokopedia.link/pHGKXuV41db), [ODROID-N2](https://www.tokopedia.com/search?st=product&q=ODROID-N2) | 全部 | armbian_aml_s922x_buster_*.img | -| s905x3 | [X96-Max+](https://tokopedia.link/uMaH09s41db), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https://tokopedia.link/duoIXZpdGgb), [X96-Air](https://tokopedia.link/5WHiETbdGgb), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb) | 全部 | armbian_aml_s905x3_buster_*.img | -| s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb) | 全部 | armbian_aml_s905x2_buster_*.img | -| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | 全部 | armbian_aml_s912_buster_*.img | -| s905d | Phicomm-N1 | 全部 | armbian_aml_s905d_buster_*.img | -| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://tokopedia.link/LC4DiTXtEib) | 5.4.* | armbian_aml_s905x_buster_*.img | -| s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.tokopedia.com/beststereo/tanix-tx3-mini-2gb-16gb-android-7-1-kodi-17-3-amlogic-s905w-4k-tv-box) | 5.4.* | armbian_aml_s905w_buster_*.img | +| s922x | [Belink](https://tokopedia.link/RAgZmOM41db), [Belink-Pro](https://tokopedia.link/sfTHlfS41db), [Ugoos-AM6-Plus](https://tokopedia.link/pHGKXuV41db), [ODROID-N2](https://www.tokopedia.com/search?st=product&q=ODROID-N2) | 全部 | armbian_aml_s922x_*.img | +| s905x3 | [X96-Max+](https://tokopedia.link/uMaH09s41db), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https://tokopedia.link/duoIXZpdGgb), [X96-Air](https://tokopedia.link/5WHiETbdGgb), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb) | 全部 | armbian_aml_s905x3_*.img | +| s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb) | 全部 | armbian_aml_s905x2_*.img | +| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | 全部 | armbian_aml_s912_*.img | +| s905d | Phicomm-N1 | 全部 | armbian_aml_s905d_*.img | +| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://tokopedia.link/LC4DiTXtEib) | 5.4.* | armbian_aml_s905x_*.img | +| s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.tokopedia.com/beststereo/tanix-tx3-mini-2gb-16gb-android-7-1-kodi-17-3-amlogic-s905w-4k-tv-box) | 5.4.* | armbian_aml_s905w_*.img | ## 安装及升级 Armbian 的相关说明 @@ -155,7 +155,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) 2. 克隆仓库到本地 `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-armbian.git` -3. 在根目录下创建文件夹 `build/output/images` ，并上传 Armbian 镜像文件 ( 如：`Armbian_21.11.0-trunk_Lepotato_buster_current_5.10.80.img` ) 到 `~/amlogic-s9xxx-armbian/build/output/images` 目录里。原版 Armbian 镜像文件名称中的发行版本号（如：`21.11.0`）和内核版本号（如：`5.10.80`）请保留，它将在重构后用作 Armbian 固件的名称。 +3. 在根目录下创建文件夹 `build/output/images` ，并上传 Armbian 镜像文件 ( 如：`Armbian_21.11.0-trunk_Lepotato_current_5.10.80.img` ) 到 `~/amlogic-s9xxx-armbian/build/output/images` 目录里。原版 Armbian 镜像文件名称中的发行版本号（如：`21.11.0`）和内核版本号（如：`5.10.80`）请保留，它将在重构后用作 Armbian 固件的名称。 4. 进入 `~/amlogic-s9xxx-armbian` 根目录，然后运行 `sudo ./rebuild -d -b s905x3 -k 5.4.160` 命令即可生成指定 soc 的 Armbian 镜像文件。生成的文件保存在 `build/output/images` 目录里。 @@ -169,7 +169,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) - ### 仅单独引入 GitHub Action 进行 Armbian 重构 -你可以使用其他方式构建 Armbian 固件。或者使用 [Armbian](https://armbian.tnahosting.net/dl/) 官方提供的 [lepotato](https://armbian.tnahosting.net/dl/lepotato/archive/) 等分支的固件，仅在流程控制文件 [.yml](.github/workflows/rebuild-armbian.yml) 中引入本仓库的脚本进行 Armbian 重构，适配 Amlogic S9xxx 系列盒子的使用。在 [Action](https://github.com/ophub/amlogic-s9xxx-armbian/actions) 页面里选择 ***`Rebuild armbian`*** ，输入 Armbian 的网络下载地址如 `https://dl.armbian.com/*/Armbian_*_buster_*.img.xz` ，或者在流程控制文件 [.yml](.github/workflows/rebuild-armbian.yml) 中通过 `armbian_path` 参数设定重构文件的加载路径。代码如下: +你可以使用其他方式构建 Armbian 固件。或者使用 [Armbian](https://armbian.tnahosting.net/dl/) 官方提供的 [lepotato](https://armbian.tnahosting.net/dl/lepotato/archive/) 等分支的固件，仅在流程控制文件 [.yml](.github/workflows/rebuild-armbian.yml) 中引入本仓库的脚本进行 Armbian 重构，适配 Amlogic S9xxx 系列盒子的使用。在 [Action](https://github.com/ophub/amlogic-s9xxx-armbian/actions) 页面里选择 ***`Rebuild armbian`*** ，输入 Armbian 的网络下载地址如 `https://dl.armbian.com/*/Armbian_*.img.xz` ，或者在流程控制文件 [.yml](.github/workflows/rebuild-armbian.yml) 中通过 `armbian_path` 参数设定重构文件的加载路径。代码如下: ```yaml - name: Rebuild Armbian for Amlogic s9xxx @@ -184,7 +184,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) | 参数 | 默认值 | 说明 | |------------------------|------------------------|------------------------------------------------| -| armbian_path | no | 设置原版 Armbian 文件的路径，支持使用当前工作流中的文件路径如 `build/output/images/*.img` ，也支持使用网络下载地址如： `https://dl.armbian.com/*/Armbian_*_buster_*.img.xz` | +| armbian_path | no | 设置原版 Armbian 文件的路径，支持使用当前工作流中的文件路径如 `build/output/images/*.img` ，也支持使用网络下载地址如： `https://dl.armbian.com/*/Armbian_*.img.xz` | | armbian_soc | s905d_s905x3 | 设置打包盒子的 `SOC` ，可指定单个盒子如 `s905x3` ，可选择多个盒子用_连接如 `s905x3_s905d` 。各盒子的SoC代码为：`s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`。说明：`s922x-n2` 是 `s922x-odroid-n2` | | version_branch | stable | 指定内核 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 名称，如 `stable` 。指定的名称须与分支目录名称相同。默认使用 `stable` 分支版本。 | | armbian_kernel | 5.10.80_5.4.160 | 设置内核版本，[kernel](https://github.com/ophub/kernel/tree/main/pub/stable) 库里收藏了众多 Flippy 的原版内核，可以查看并选择指定。 | diff --git a/README.md b/README.md index 8e0b22b2f4..d347e291d2 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https | Model | STB | [Optional kernel](https://github.com/ophub/kernel/tree/main/pub/stable) | Armbian Firmware | | ---- | ---- | ---- | ---- | -| s922x | [Belink](https://tokopedia.link/RAgZmOM41db), [Belink-Pro](https://tokopedia.link/sfTHlfS41db), [Ugoos-AM6-Plus](https://tokopedia.link/pHGKXuV41db), [ODROID-N2](https://www.tokopedia.com/search?st=product&q=ODROID-N2) | All | armbian_aml_s922x_buster_*.img | -| s905x3 | [X96-Max+](https://tokopedia.link/uMaH09s41db), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https://tokopedia.link/duoIXZpdGgb), [X96-Air](https://tokopedia.link/5WHiETbdGgb), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb) | All | armbian_aml_s905x3_buster_*.img | -| s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb) | All | armbian_aml_s905x2_buster_*.img | -| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | All | armbian_aml_s912_buster_*.img | -| s905d | Phicomm-N1 | All | armbian_aml_s905d_buster_*.img | -| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://tokopedia.link/LC4DiTXtEib) | 5.4.* | armbian_aml_s905x_buster_*.img | -| s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.tokopedia.com/beststereo/tanix-tx3-mini-2gb-16gb-android-7-1-kodi-17-3-amlogic-s905w-4k-tv-box) | 5.4.* | armbian_aml_s905w_buster_*.img | +| s922x | [Belink](https://tokopedia.link/RAgZmOM41db), [Belink-Pro](https://tokopedia.link/sfTHlfS41db), [Ugoos-AM6-Plus](https://tokopedia.link/pHGKXuV41db), [ODROID-N2](https://www.tokopedia.com/search?st=product&q=ODROID-N2) | All | armbian_aml_s922x_*.img | +| s905x3 | [X96-Max+](https://tokopedia.link/uMaH09s41db), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https://tokopedia.link/duoIXZpdGgb), [X96-Air](https://tokopedia.link/5WHiETbdGgb), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb) | All | armbian_aml_s905x3_*.img | +| s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb) | All | armbian_aml_s905x2_*.img | +| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | All | armbian_aml_s912_*.img | +| s905d | Phicomm-N1 | All | armbian_aml_s905d_*.img | +| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://tokopedia.link/LC4DiTXtEib) | 5.4.* | armbian_aml_s905x_*.img | +| s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.tokopedia.com/beststereo/tanix-tx3-mini-2gb-16gb-android-7-1-kodi-17-3-amlogic-s905w-4k-tv-box) | 5.4.* | armbian_aml_s905w_*.img | ## Install to EMMC and update instructions @@ -155,7 +155,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) 2. Clone the repository to the local. `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-armbian.git` -3. Create the `build/output/images` folder, and upload the Armbian image ( Eg: `Armbian_21.11.0-trunk_Lepotato_buster_current_5.10.80.img` ) to this `~/amlogic-s9xxx-armbian/build/output/images` directory. Please keep the release version number (e.g. `21.11.0`) and kernel version number (e.g. `5.10.80`) in the name of the original Armbian image file, It will be used as the name of the armbian firmware after rebuilding. +3. Create the `build/output/images` folder, and upload the Armbian image ( Eg: `Armbian_21.11.0-trunk_Lepotato_current_5.10.80.img` ) to this `~/amlogic-s9xxx-armbian/build/output/images` directory. Please keep the release version number (e.g. `21.11.0`) and kernel version number (e.g. `5.10.80`) in the name of the original Armbian image file, It will be used as the name of the armbian firmware after rebuilding. 4. Enter the `~/amlogic-s9xxx-armbian` root directory. And run Eg: `sudo ./rebuild -d -b s905x3 -k 5.4.160` to build armbian for `amlogic s9xxx`. The generated Armbian image is in the `build/output/images` directory under the root directory. @@ -169,7 +169,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) - ### Only import GitHub Action for Armbian rebuild -You can use other methods to build the Armbian system. Or use [Armbian](https://armbian.tnahosting.net/dl/) officially provided [lepotato](https://armbian.tnahosting.net/dl/lepotato/archive/) and other branch firmware. and only import the Action from this repository in the process control file [.yml](.github/workflows/rebuild-armbian.yml) to rebuild Armbian to adapt to the use of Amlogic S9xxx series boxes. In the [Action](https://github.com/ophub/amlogic-s9xxx-armbian/actions) page, select ***`Rebuild armbian`***, and enter the Armbian network download url such as `https://dl.armbian.com/*/Armbian_*_buster_*.img.xz`, or in the process control file [.yml](.github/workflows/rebuild-armbian.yml), set the load path of the rebuild file through the `armbian_path` parameter. code show as below: +You can use other methods to build the Armbian system. Or use [Armbian](https://armbian.tnahosting.net/dl/) officially provided [lepotato](https://armbian.tnahosting.net/dl/lepotato/archive/) and other branch firmware. and only import the Action from this repository in the process control file [.yml](.github/workflows/rebuild-armbian.yml) to rebuild Armbian to adapt to the use of Amlogic S9xxx series boxes. In the [Action](https://github.com/ophub/amlogic-s9xxx-armbian/actions) page, select ***`Rebuild armbian`***, and enter the Armbian network download url such as `https://dl.armbian.com/*/Armbian_*.img.xz`, or in the process control file [.yml](.github/workflows/rebuild-armbian.yml), set the load path of the rebuild file through the `armbian_path` parameter. code show as below: ```yaml - name: Rebuild Armbian for Amlogic s9xxx @@ -184,7 +184,7 @@ You can use other methods to build the Armbian system. Or use [Armbian](https:// | parameter | Defaults | Description | |------------------------|------------------------|---------------------------------------------------------------| -| armbian_path | no | Set the path of the original Armbian file, support the file path in the current workflow such as `build/output/images/*.img`, and also support the use of the network download address such as: `https://dl.armbian.com/*/Armbian_*_buster_*.img.xz` | +| armbian_path | no | Set the path of the original Armbian file, support the file path in the current workflow such as `build/output/images/*.img`, and also support the use of the network download address such as: `https://dl.armbian.com/*/Armbian_*.img.xz` | | armbian_soc | s905d_s905x3 | Set the `SoC` of the packaging box, you can specify a single box such as `s905x3`, you can choose multiple boxes to use `_` connection such as `s905x3_s905d` . SOC code of each box is: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`. Note: `s922x-n2` is `s922x-odroid-n2` | | version_branch | stable | Specify the name of the kernel [version branch](https://github.com/ophub/kernel/tree/main/pub), Such as `stable`. The specified name must be the same as the branch directory name. The `stable` branch version is used by default. | | armbian_kernel | 5.10.80_5.4.160 | Set the kernel version，The [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) library contains many original kernels of `Flippy`, you can view and choose to specify. | diff --git a/rebuild b/rebuild index 8b10535584..75171304af 100755 --- a/rebuild +++ b/rebuild @@ -113,7 +113,7 @@ make_image() { fi # Make Amlogic s9xxx armbian - build_image_file="${tmp_outpath}/Armbian_${armbian_original_version}_Aml_${build_soc}_buster_${make_version}_$(date +"%Y.%m.%d.%H%M").img" + build_image_file="${tmp_outpath}/Armbian_${armbian_original_version}_Aml_${build_soc}_bullseye_${make_version}_$(date +"%Y.%m.%d.%H%M").img" rm -f ${build_image_file} sync @@ -446,7 +446,7 @@ copy_files() { clean_tmp() { cd ${tmp_outpath} # Rename version - [[ "${diff_release_name}" != "buster" ]] && rename "s/buster/${diff_release_name}/g" *.img 2>/dev/null && sync + [[ "${diff_release_name}" != "bullseye" ]] && rename "s/bullseye/${diff_release_name}/g" *.img 2>/dev/null && sync gzip *.img && sync && mv -f *.img.gz ${armbian_outputpath} sync diff --git a/recompile b/recompile index f3ecd42025..553c9759ee 100755 --- a/recompile +++ b/recompile @@ -33,7 +33,7 @@ use_linuxgun_localpath="/usr/local/aarch64" # Armbian system armbian_repo="ophub/amlogic-s9xxx-armbian" -armbian_releases_file="Armbian_Aml_buster_.*/Armbian_.*_s905d_.*.img.gz" +armbian_releases_file="Armbian_Aml_.*/Armbian_.*_s905d_.*.img.gz" armbian_tmp_file="${out_kernel}/tmp/armbian.img" armbian_chroot_file="${out_kernel}/armbian/armbian.img"