From 45fa4d893d169bed1609bc01f7d139abc0d9a4a2 Mon Sep 17 00:00:00 2001
From: hyx <dylan.huang@tauzin.cn>
Date: Fri, 3 Apr 2026 12:30:15 +0800
Subject: [PATCH] ota version detection process has been fixed uneed files have
 been removed names of copied files have been changed

---
 .../rootfs_overlay/etc/init.d/S99ota_check    |   3 ++
 .../tools/libhardware/lib/libhardware.a       | Bin 10574 -> 10510 bytes
 .../tools/make_ota_package.sh                 |  39 +++++-------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S99ota_check b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S99ota_check
index 615c4dd1f..302c43ddb 100755
--- a/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S99ota_check
+++ b/sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/rootfs_overlay/etc/init.d/S99ota_check
@@ -20,6 +20,9 @@ version_compare() {
 }
 
 ota_check() {
+    rm -f /tmp/.ota_upgrading
+    rm -f /data/.ota_lock
+
     # 检查是否存在升级信息文件
     if [ ! -f "/data/update/.update_info.txt" ]; then
         return 0  # 没有升级信息，跳过检查
diff --git a/sdk/X-AIOS-LT00-V1.0.4/tools/libhardware/lib/libhardware.a b/sdk/X-AIOS-LT00-V1.0.4/tools/libhardware/lib/libhardware.a
index a6638a44ae1b99ab4d5f7b29c9ada945799b168d..3f7c43e8f30745b54c3d9bb2075dade6b849991a 100644
GIT binary patch
delta 1029
zcmYk)Pe>F|90%~<+vaH*)h^g3vB6;KjvzX2i-`0`L_)9*Z9#ijBT_`YtZ0g`!dRE~
z;-<U~)kVRAAc&O>?2vS5k5L^wbm$-?;Xw#G?MeF1RLu8xc)#E0_ul;8FwEynDYJ4;
z_x7ezsnzD|c2L;1Yy0tc?RMRsblSGN-3vYL>f@w(y18}tL}TaNy-5*io$Z>*=kJft
z`mPM0d=)W~*cCGnyJSj1K3(|{`&H*%Q#c%imK(@9@@;sUJOWqAqwpuPfA20i5ATuZ
zU@L+p2rUH>Ph4s|z{W-LBY23s4BsLfI7fa4FOb*ZmLph#(DD+wN`5VaBK_9CebKUs
z@;!MA&gpP}8)cdN5&o)8<JrqzjoLraj@E^b9iU8;f5T(s8eAkF!s}!UAF)bqfOpAJ
zg%4SyMjQv6dQ1sIO9IZ4o8cw01DDC2@H=uE{!Z?Lt)t=me&va{)VPWRLuCIqTO?=T
z6>=7SLB0c*$zyPpJOv++r#&>RW8oXk!yV*BI7@yA7s*BVEx82mke|TP5YB%NC&+po
zjh4#IMB%u~nlH(M8Z^Vsd9`HnPBO9)H{~;N^Tvs)4f6qwZ*jBlw5cX@sy*4{wuwyq
KAC2r^<;Ne>9A|_8

delta 1097
zcmYk)Pe>F|90&0CwwbMzau;hg*kG`9hYX$FM%g;3$kHVx-Af+Uj1n;scgeNO3WFl(
zCI9d`tRg5>Aas&Fcu^3%c&ZK_ItDJ$L1+mN9wPeAWX$(>c=JBr-<x@lx4W4BlwQ86
zTW$A~_f{Hu4R2x?mf_aFF>YDywrv=3%TCxUOELL%d*|5|dnoa!dnlerVocb*-7Qnk
zUkX&?Wb3PJHa{{+{kV1BFEwA?3e-@?eN#OSUspducT_ms!9Dja^g5A8O7FrygHA@e
zJGiBbevH%PC-5?P5H6Enz$awyumOZ#=^~4#MxKIilM6yPqK|?ZEXa`O;ZgD%I8Rpa
zG<g*+k~iSg1q@#4;sc&#@<)*pBB!1AaRb|!{wD9h>$>0H!?Z#^fI~rbbfd#b2K{B<
zG3_Itz<Kg7_&xayJ|zEvzmYXuvUU-nSGuTz4RT20B9jzEuwaxNg^T0{c%N*-6><xF
zMz-PTCI0{q;1sz_I=Dy*9%8`)xd+}Qr{OQ;0k}+l3RlR(uy)x$z!-d&oO2MQD0mHz
zlimMykvt0@k{94p@*;e#%HQxU+(ll4Gh}@e!EmWITBw#qwG=DJIaO`mlKZOFj0KJ(
lDpwa#6J|&rD+fV+o!T;+<be8Y#_DrT__h9Tg(tq`)nAnTd8PmW

diff --git a/sdk/X-AIOS-LT00-V1.0.4/tools/make_ota_package.sh b/sdk/X-AIOS-LT00-V1.0.4/tools/make_ota_package.sh
index b4c2a4296..6262659c2 100755
--- a/sdk/X-AIOS-LT00-V1.0.4/tools/make_ota_package.sh
+++ b/sdk/X-AIOS-LT00-V1.0.4/tools/make_ota_package.sh
@@ -10,10 +10,12 @@ GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 NC='\033[0m'
 
-# 项目根目录
-SDK_ROOT="/home/hyx/work/linuxOS_MC3302/sdk/X-AIOS-LT00-V1.0.4"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SDK_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 OUT_DIR="${SDK_ROOT}/out/qm10xd_linux/qmimages"
 
+echo "检测到SDK路径: ${SDK_ROOT}"
+
 # 临时工作目录
 WORK_DIR="/tmp/ota_package_$(date +%Y%m%d_%H%M%S)"
 UPDATE_DIR="${WORK_DIR}/update"
@@ -78,38 +80,17 @@ echo -e "${GREEN}✓${NC} logo.img.lzma ($(du -h ${UPDATE_DIR}/logo.img.lzma | c
 
 # 复制ubi镜像
 echo "复制 system.ubi..."
-cp "${SYSTEM_SRC}" "${UPDATE_DIR}/system_2KB_128KB_24MB.ubi"
-echo -e "${GREEN}✓${NC} system_2KB_128KB_24MB.ubi ($(du -h ${UPDATE_DIR}/system_2KB_128KB_24MB.ubi | cut -f1))"
+cp "${SYSTEM_SRC}" "${UPDATE_DIR}/system.ubi"
+echo -e "${GREEN}✓${NC} system.ubi ($(du -h ${UPDATE_DIR}/system.ubi | cut -f1))"
 
 echo "复制 rootfs.ubi..."
-cp "${ROOTFS_SRC}" "${UPDATE_DIR}/rootfs_2KB_128KB_10MB.ubi"
-echo -e "${GREEN}✓${NC} rootfs_2KB_128KB_10MB.ubi ($(du -h ${UPDATE_DIR}/rootfs_2KB_128KB_10MB.ubi | cut -f1))"
+cp "${ROOTFS_SRC}" "${UPDATE_DIR}/rootfs.ubi"
+echo -e "${GREEN}✓${NC} rootfs.ubi ($(du -h ${UPDATE_DIR}/rootfs.ubi | cut -f1))"
 
 echo ""
-echo -e "${YELLOW}[4/5] 添加升级进度图片和脚本...${NC}"
+echo -e "${YELLOW}[4/5] 添加升级脚本...${NC}"
 
-# 从SDK中复制进度图片
-LOGO_SRC_DIR="${SDK_ROOT}/tools/ubuntu/logotool/logopart/meisite"
-if [ -d "${LOGO_SRC_DIR}" ]; then
-    echo "复制SDK中的进度图片..."
-    if [ -f "${LOGO_SRC_DIR}/logo_update_0.jpg" ]; then
-        cp "${LOGO_SRC_DIR}/logo_update_0.jpg" "${UPDATE_DIR}/logo_update.jpg"
-        echo -e "${GREEN}✓${NC} logo_update.jpg"
-    fi
-    for i in {1..5}; do
-        if [ -f "${LOGO_SRC_DIR}/logo_update_${i}.jpg" ]; then
-            cp "${LOGO_SRC_DIR}/logo_update_${i}.jpg" "${UPDATE_DIR}/"
-            echo -e "${GREEN}✓${NC} logo_update_${i}.jpg"
-        else
-            echo -e "${RED}✗${NC} 警告: 找不到 logo_update_${i}.jpg"
-        fi
-    done
-else
-    echo -e "${RED}✗${NC} 错误: 找不到进度图片目录: ${LOGO_SRC_DIR}"
-    exit 1
-fi
-
-# 添加uboot升级脚本
+# 添加uboot升级脚本（进度图片从logo分区读取，不需要打包）
 SCRIPT_OTA="${SDK_ROOT}/tools/partition/qm10xd/los_spi-nand/demo_ld_nand/script-ota.ini"
 if [ -f "${SCRIPT_OTA}" ]; then
     echo "复制 script-ota.ini..."