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 a6638a44a..3f7c43e8f 100644 Binary files a/sdk/X-AIOS-LT00-V1.0.4/tools/libhardware/lib/libhardware.a and b/sdk/X-AIOS-LT00-V1.0.4/tools/libhardware/lib/libhardware.a differ 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..."