armbian-update: wxy-oect: Handle kernel updates based on special model numbers

Author: ophub

build-armbian/armbian-files/common-files/etc/model_database.conf

@@ -243,10 +243,10 @@ r215    :MMBox-Anas3035                              :rk3568   :rk3568-mmbox-ana
 r301    :Panther-X2                                  :rk3566   :rk3566-panther-x2.dtb                  :NA                           :u-boot.itb                          :idbloader.img                   :4GB-LPDDR4,32G-eMMC,64G-TF,2x1Gb-Nic       :stable/6.1.y    :rockchip    :rk3566       :armbianEnv.txt  :tdleiyao                                             :panther-x2          :yes
 r302    :JP-TvBox                                    :rk3566   :rk3566-jp-tvbox.dtb                    :NA                           :u-boot.itb                          :idbloader.img                   :8GB-LPDDR4,32G-eMMC,SATA,1Gb-Nic           :stable/6.1.y    :rockchip    :rk3566       :armbianEnv.txt  :unifreq                                              :jp-tvbox            :yes
 r303    :LCKFB-Taishan-Pi                            :rk3566   :rk3566-taishanpi-v10.dtb               :NA                           :u-boot.itb                          :idbloader.img                   :2GB-LPDDR4,16G-eMMC,SATA,1Gb-Nic           :rk35xx/6.1.y    :rockchip    :rk3566       :armbianEnv.txt  :ccu6                                                 :lckfb-tspi          :yes
-r304    :WXY-OEC-turbo-4g(Replaced-Chip-and-eMMC)    :rk3566   :rk3566-wxy-oec-turbo-4g.dtb            :NA                           :u-boot.itb                          :idbloader.img                   :4GB-LPDDR4,Replaced-eMMC,1xSATA,1Gb-Nic    :stable/6.12.y   :rockchip    :rk3566       :extlinux.conf   :andyfanybo,dd-ray                                    :wxy-oec-replaced    :yes
+r304    :♥,WXY-OEC-turbo-4g(Replaced-Chip-and-eMMC)  :rk3566   :rk3566-wxy-oec-turbo-4g.dtb            :NA                           :u-boot.itb                          :idbloader.img                   :4GB-LPDDR4,Replaced-eMMC,1xSATA,1Gb-Nic    :stable/6.12.y   :rockchip    :rk3566       :extlinux.conf   :andyfanybo,dd-ray                                    :wxy-oec-replaced    :yes
 r305    :Station-M2                                  :rk3566   :rk3566-roc-pc.dtb                      :NA                           :NA                                  :u-boot-rockchip.bin             :2GB-LPDDR4,32G-eMMC,NVMe,TF,1Gb-Nic        :stable/6.12.y   :rockchip    :rk3566       :armbianEnv.txt  :Kwonelee                                             :station-m2          :yes
 #-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
-r306    :WXY-OEC-turbo-4g(Original-Edition)          :rk3566   :rk3566-wxy-oec-turbo-4g.dtb            :NA                           :NA                                  :bootloader.bin                  :4GB-LPDDR4,8G-eMMC,1xSATA,1Gb-Nic          :stable/6.12.y   :rockchip    :rk3566       :extlinux.conf   :dd-ray,hoiw                                          :wxy-oect            :yes
+r306    :♥,WXY-OEC-turbo-4g(Original-Edition)        :rk3566   :rk3566-wxy-oec-turbo-4g.dtb            :NA                           :NA                                  :bootloader.bin                  :4GB-LPDDR4,8G-eMMC,1xSATA,1Gb-Nic          :stable/6.12.y   :rockchip    :rk3566       :extlinux.conf   :dd-ray,hoiw                                          :wxy-oect            :yes
 
 
 # Rockchip RK3399 Family

build-armbian/armbian-files/common-files/usr/sbin/armbian-update

@@ -116,13 +116,13 @@ check_disk() {
 
     # Find the disk where the partition is located, only supports mmcblk?p? sd?? hd?? vd?? and other formats
     case "${ROOT_PTNAME}" in
-    mmcblk?p[1-4])
+    mmcblk?p[1-9])
         DISK_NAME="${ROOT_PTNAME:0:-2}"
         ;;
-    [hsv]d[a-z][1-4])
+    [hsv]d[a-z][1-9])
         DISK_NAME="${ROOT_PTNAME:0:-1}"
         ;;
-    nvme?n?p[1-4])
+    nvme?n?p[1-9])
         DISK_NAME="${ROOT_PTNAME:0:-2}"
         ;;
     *)
@@ -156,6 +156,7 @@ init_var() {
     # Get values
     source "${ophub_release_file}"
     PLATFORM="${PLATFORM}"
+    MODEL_ID="${MODEL_ID}"
     UBOOT_OVERLOAD="${UBOOT_OVERLOAD}"
     MAINLINE_UBOOT="${MAINLINE_UBOOT}"
     KERNEL_REPO="${KERNEL_REPO}"
@@ -503,6 +504,8 @@ update_kernel() {
     [[ "${PLATFORM}" == "amlogic" ]] && (cd /boot && cp -f uInitrd-${kernel_name} uInitrd && cp -f vmlinuz-${kernel_name} zImage)
     [[ "${PLATFORM}" == "rockchip" ]] && (cd /boot && ln -sf uInitrd-${kernel_name} uInitrd && ln -sf vmlinuz-${kernel_name} Image)
     [[ "${PLATFORM}" == "allwinner" ]] && (cd /boot && cp -f uInitrd-${kernel_name} uInitrd && cp -f vmlinuz-${kernel_name} Image)
+    # wxy-oect: MODEL_ID numbers r304 and r306, require special handling of uInitrd
+    [[ "${MODEL_ID}" == "r304" || "${MODEL_ID}" == "r306" ]] && (cd /boot && rm -f uInitrd && ln -sf initrd.img-${kernel_name} uInitrd)
     [[ "$(ls /boot/*${kernel_name}* -l 2>/dev/null | grep "^-" | wc -l)" -ge "4" ]] || error_msg "The /boot files is missing."
     echo -e "${INFO} (1/4) Unpacking [ boot-${kernel_name}.tar.gz ] succeeded."