ddbr renamed to armbian-ddbr

thangnd85 · Feb 3, 2022 · a097e7e · a097e7e
1 parent 1d1d2db
commit a097e7e
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 32 deletions.
diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
@@ -48,7 +48,7 @@ jobs:
           sudo timedatectl set-timezone "$TZ"
           sudo mkdir -p /workdir
           sudo chown $USER:$GROUPS /workdir
-          echo "COMPILE_STARTINGTIME=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "COMPILE_STARTINGTIME=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
 
           ARR_RELEASE=("focal" "bullseye" "buster")
           set_release="${{ github.event.inputs.set_release }}"
@@ -78,7 +78,8 @@ jobs:
           sudo chmod +x compile.sh
           sudo ./compile.sh BOARD=${{ env.ARMBIAN_BOARD }} RELEASE=${{ env.ARMBIAN_RELEASE }} BRANCH=current \
                             BUILD_MINIMAL=no BUILD_DESKTOP=no HOST=armbian KERNEL_ONLY=no KERNEL_CONFIGURE=no \
-                            CLEAN_LEVEL=make,debs COMPRESS_OUTPUTIMAGE=sha,img ${{ env.ARMBIAN_MORE_OPTS }}
+                            CLEAN_LEVEL=make,debs COMPRESS_OUTPUTIMAGE=sha KERNEL_KEEP_CONFIG=no EXTERNAL=no \
+                            ${{ env.ARMBIAN_MORE_OPTS }}
           echo "::set-output name=status::success"
 
       - name: Rebuild Armbian for amlogic s9xxx
@@ -92,7 +93,7 @@ jobs:
           sudo ./rebuild -d -b s905w -k 5.4.170
           cd build/output/images/ && sudo gzip *.img && sync
           echo "FILEPATH=$PWD" >> $GITHUB_ENV
-          echo "FILE_DATE=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "FILE_DATE=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
           echo "::set-output name=status::success"
 
       - name: Upload Armbian image to Release

diff --git a/.github/workflows/compile-kernel.yml b/.github/workflows/compile-kernel.yml
@@ -3,7 +3,7 @@
 # Copyright (C) 2021 https://github.com/ophub/amlogic-s9xxx-armbian
 #==========================================================================
 
-name: Compile the armbian kernel
+name: Compile the kernel
 
 on:
   repository_dispatch:
@@ -40,7 +40,7 @@ jobs:
           sudo -E apt-get -qq autoremove --purge
           sudo -E apt-get -qq clean
           sudo timedatectl set-timezone "$TZ"
-          echo "COMPILE_STARTINGTIME=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "COMPILE_STARTINGTIME=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
 
           kernel_repo="${{ github.event.inputs.kernel_repo }}"
           [ -z "${kernel_repo}"] && kernel_repo="kernel.org"
@@ -59,7 +59,7 @@ jobs:
           output_tags="$(ls ${output_dirname}/*.tar.gz -l | awk '{print $9}' | grep -oE '[1-9].[0-9]{1,3}.[0-9]+' | xargs | tr "[ ]" "_")"
           echo "PACKAGED_OUTPUTTAGS=${output_tags}" >> $GITHUB_ENV
           echo "PACKAGED_OUTPUTPATH=${output_dirname}" >> $GITHUB_ENV
-          echo "PACKAGED_OUTPUTDATE=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "PACKAGED_OUTPUTDATE=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
           echo "::set-output name=status::success"
 
       - name: Upload Kernel to Release

diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml
@@ -53,7 +53,7 @@ jobs:
               fi
           fi
           echo "ARMBIAN_URL=${armbian_url}" >> $GITHUB_ENV
-          echo "COMPILE_STARTINGTIME=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "COMPILE_STARTINGTIME=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
 
           # Get the release name of the rebuild armbian file
           set_release="_"

diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
@@ -36,7 +36,7 @@ jobs:
           sudo -E apt-get -qq autoremove --purge
           sudo -E apt-get -qq clean
           sudo timedatectl set-timezone "$TZ"
-          echo "COMPILE_STARTINGTIME=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "COMPILE_STARTINGTIME=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
 
       - name: Rebuild Armbian for amlogic s9xxx
         id: rebuild
@@ -73,7 +73,7 @@ jobs:
           sudo ./rebuild -d -b s905w -k 5.4.170
           cd ./build/output/images && sudo gzip *.img && sync
           echo "FILEPATH=$PWD" >> $GITHUB_ENV
-          echo "FILE_DATE=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV
+          echo "FILE_DATE=$(date +"%m.%d.%H%M")" >> $GITHUB_ENV
           echo "::set-output name=status::success"
 
       - name: Upload Armbian image to Release

diff --git a/CONTRIBUTOR.md b/CONTRIBUTOR.md
@@ -16,5 +16,5 @@ Because of these innovations and contributors, we can have the company of the bo
 | [JFLim1](https://github.com/JFLim1) | [2022-01-15]. He shared the available `dtb` and `u-boot` of the `Beelink-GT-King-Pro (Revision A, Serial #SA9HH...)` `s922x` box in [issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72#issuecomment-1012127495). After his tests, it was finally determined that the combination of `meson-g12b-gtking-pro.dtb` and `u-boot-gtkingpro-rev-a.bin` could be used. Mouse, keyboard, bluetooth, wireless are normal. |
 | [flymike](https://github.com/flymike) | [2022-01-16]. After his test in [issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/79), in the `MECOOL-KM3-4G` `s905x2` box, the combination of `meson-g12a-sei510.dtb` and `u-boot-x96max.bin` can be used normally, supporting the `5.10 kernel`. Network, bluetooth, wireless are normal. |
 | [JFLim1](https://github.com/JFLim1) | [2022-01-18]. After his test in [issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/81), He provided a solution to the `black screen` of the `gtking-pro-rev-a` box by disabling the `/etc/udev/rules.d/hdmi.rules` file. |
-
+| [DiogoSilva48](https://github.com/DiogoSilva48) | [2022-02-02]. After his test in [issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/98), The `tbee-box` can use the default firmware of the `s905x`. He provided two ways to enable `wifi`. |
 
diff --git a/README.cn.md b/README.cn.md
@@ -15,7 +15,7 @@
 | s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb), [MECOOL-KM3-4G](https://www.gearbest.com/tv-box/pp_3008133484979616.html) | 全部 | armbian_aml_s905x2_*.img |
 | s912 | [H96-Pro-Plus](https://www.gearbest.com/tv-box-mini-pc/pp_503486.html), [Tanix-TX92](http://www.tanix-box.com/project-view/tanix-tx92-android-tv-box-powered-amlogic-s912/), [VORKE-Z6-Plus](http://www.vorke.com/project/vorke-z6-2/), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | 全部 | armbian_aml_s912_*.img |
 | s905d | [MECOOL-KI-Pro](https://www.gearbest.com/tv-box-mini-pc/pp_629409.html), Phicomm-N1 | 全部 | armbian_aml_s905d_*.img |
-| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://www.zte.com.cn/global/products/cocloud/201707261551/IP-STB/ZXV10-B860H) | 全部 | armbian_aml_s905x_*.img |
+| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://www.zte.com.cn/global/products/cocloud/201707261551/IP-STB/ZXV10-B860H), [TBee-Box](https://www.tbee.com/product/tbee-box/) | 全部 | armbian_aml_s905x_*.img |
 | s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.gearbest.com/tv-box/pp_009748238474.html) | 5.4.* | armbian_aml_s905w_*.img |
 | s905 | [Beelink-Mini-MX-2G](https://www.gearbest.com/tv-box-mini-pc/pp_321409.html), [MXQ-Pro+4K](https://www.gearbest.com/tv-box-mini-pc/pp_354313.html) | 全部 | armbian_aml_s905_*.img |
 
@@ -136,7 +136,7 @@ armbian-tf
 请从 `TF/SD/USB` 启动 Armbian 系统 → 输入命令：
 
 ```yaml
-ddbr
+armbian-ddbr
 ```
 
 根据提示输入 `b` 进行系统备份，输入 `r` 进行系统恢复。

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https
 | s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb), [MECOOL-KM3-4G](https://www.gearbest.com/tv-box/pp_3008133484979616.html) | All | armbian_aml_s905x2_*.img |
 | s912 | [H96-Pro-Plus](https://www.gearbest.com/tv-box-mini-pc/pp_503486.html), [Tanix-TX92](http://www.tanix-box.com/project-view/tanix-tx92-android-tv-box-powered-amlogic-s912/), [VORKE-Z6-Plus](http://www.vorke.com/project/vorke-z6-2/), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | All | armbian_aml_s912_*.img |
 | s905d | [MECOOL-KI-Pro](https://www.gearbest.com/tv-box-mini-pc/pp_629409.html), Phicomm-N1 | All | armbian_aml_s905d_*.img |
-| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://www.zte.com.cn/global/products/cocloud/201707261551/IP-STB/ZXV10-B860H) | All | armbian_aml_s905x_*.img |
+| s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://www.zte.com.cn/global/products/cocloud/201707261551/IP-STB/ZXV10-B860H), [TBee-Box](https://www.tbee.com/product/tbee-box/) | All | armbian_aml_s905x_*.img |
 | s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.gearbest.com/tv-box/pp_009748238474.html) | 5.4.* | armbian_aml_s905w_*.img |
 | s905 | [Beelink-Mini-MX-2G](https://www.gearbest.com/tv-box-mini-pc/pp_321409.html), [MXQ-Pro+4K](https://www.gearbest.com/tv-box-mini-pc/pp_354313.html) | All | armbian_aml_s905_*.img |
 
@@ -136,7 +136,7 @@ Supports backup/restore of the box's `EMMC` partition in `TF/SD/USB`. It is reco
 Please login in to armbian → input command:
 
 ```yaml
-ddbr
+armbian-ddbr
 ```
 
 According to the prompt, enter `b` to perform system backup, and enter `r` to perform system recovery.

diff --git a/action.yml b/action.yml
@@ -52,7 +52,7 @@ inputs:
   kernel_config:
     description: "Set the path of kernel .config"
     required: false
-    default: "compile-kernel/tools/config"
+    default: ""
 
 runs:
   using: "composite"
@@ -132,7 +132,7 @@ runs:
             if [[ "$(ls ${GITHUB_WORKSPACE}/${{ inputs.kernel_config }}/config-* -l 2>/dev/null | grep "^-" | wc -l)" -ne "0" ]]; then
               echo -e "Use a custom kernel compilation template."
               rm -f ${config_filepath}/* 2>/dev/null && sync
-              sudo cp -vf ${GITHUB_WORKSPACE}/${{ inputs.kernel_config }}/config-* ${config_filepath}/ 2>/dev/null && sync
+              sudo cp -f ${GITHUB_WORKSPACE}/${{ inputs.kernel_config }}/config-* ${config_filepath}/ 2>/dev/null && sync
               echo -e "List of Kernel Custom Compilation Configuration Templates: \n$(ls ${config_filepath})"
             else
               echo -e "The custom kernel compilation template path is invalid, continue to use the default template."

diff --git a/compile-kernel/README.cn.md b/compile-kernel/README.cn.md
@@ -34,7 +34,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. 进入 `~/amlogic-s9xxx-armbian` 根目录，然后运行 `sudo ./recompile -d -k 5.4.170` 等指定参数命令即可编译内核。脚本会自动下载安装编译环境和内核源码并做好全部设置。打包好的内核文件保存在 `compile-kernel/output` 目录里。
+3. 进入 `~/amlogic-s9xxx-armbian` 根目录，然后运行 `sudo ./recompile -d -k 5.4.170` 等指定参数命令即可编译内核。脚本会自动下载安装编译环境和内核源码并做好全部设置。打包好的内核文件保存在 `compile-kernel/output` 目录里。可以将这些内核文件上传到 `Armbian` 系统任意目录，如 `/opt/5.4.170` 目录下，并在此内核目录内执行 `armbian-update` 命令进行内核安装。
 
 - ### 使用 GitHub Action 进行编译
 
@@ -78,9 +78,3 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server)
 | ${{ env.PACKAGED_OUTPUTDATE }}    | 2021.04.13.1058              | 编译日期                    |
 | ${{ env.PACKAGED_STATUS }}        | success                      | 编译状态。成功 / 失败        |
 
-## 其他说明
-
-1. 内核编译完成后，将会存放在 `compile-kernel/output` 目录下。这些内核文件会自动从当前内核编译的系统中自动清除。可以将这些内核文件上传到 `Armbian` 系统任意目录，如 `/opt/5.4.170` 目录下，并在此内核目录内执行 `armbian-update` 命令进行内核安装。
-
-2. 请先在 `USB/SD/TF` 设备上进行自定义内核测试，完成调试后再安装到正式环境中使用。
-
diff --git a/compile-kernel/README.md b/compile-kernel/README.md
@@ -34,7 +34,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server)
 
 2. Clone the repository to local: `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-armbian.git`
 
-3. Enter the root directory of `~/amlogic-s9xxx-armbian`, and then run `sudo ./recompile -d -k 5.4.170` and other specified parameter commands to compile the kernel. The script will automatically download and install the compilation environment and kernel source code and make all settings. The packaged kernel file is stored in the `compile-kernel/output` directory.
+3. Enter the root directory of `~/amlogic-s9xxx-armbian`, and then run `sudo ./recompile -d -k 5.4.170` and other specified parameter commands to compile the kernel. The script will automatically download and install the compilation environment and kernel source code and make all settings. The packaged kernel file is stored in the `compile-kernel/output` directory. You can upload these kernel files to any directory of `Armbian` system, such as `/opt/5.4.170` directory, and execute the `armbian-update` command in this kernel directory to install the kernel.
 
 - ### Compile with GitHub Action
 
@@ -78,9 +78,3 @@ The relevant parameters correspond to the `local compilation commands`, please r
 | ${{ env.PACKAGED_OUTPUTDATE }}    | 2021.04.13.1058              | compile date                    |
 | ${{ env.PACKAGED_STATUS }}        | success                      | Compile status. success / failure |
 
-## Other instructions
-
-1. After the kernel is compiled, it will be stored in the `compile-kernel/output` directory. These kernel files will be automatically cleared from the system compiled with the current kernel. You can upload these kernel files to any directory of `Armbian` system, such as `/opt/5.4.170` directory, and execute the `armbian-update` command in this kernel directory to install the kernel.
-
-2. Please perform a custom kernel test on the `USB/SD/TF` device first, and then install it in the official environment after debugging.
-
diff --git a/rebuild b/rebuild
@@ -432,7 +432,8 @@ copy_files() {
     ln -sf usr/lib lib
     ln -sf usr/sbin sbin
     ln -sf var/tmp tmp
-    ln -sf usr/share/zoneinfo/Asia/Shanghai etc/localtime
+    ln -sf /usr/share/zoneinfo/Asia/Shanghai etc/localtime
+    rm -f usr/sbin/ddbr 2>/dev/null && ln -sf armbian-ddbr usr/sbin/ddbr
 
     # Fix permission
     chmod 777 var/tmp
@@ -456,7 +457,6 @@ copy_files() {
     mv -f etc/udev/rules.d/hdmi.rules etc/udev/rules.d/hdmi.rules.bak 2>/dev/null
 
     # Add other files
-    [ -f "usr/bin/ddbr" ] || cp -f ${configfiles_path}/patches/rootfs/usr/bin/ddbr usr/bin/
     [ -f "usr/bin/uuidgen" ] || cp -f ${configfiles_path}/patches/rootfs/usr/bin/uuidgen usr/bin/
 
     # Edit the etc/fstab