diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 6dce797..8bde158 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -89,9 +89,9 @@ jobs: with: name: openwrt_firmware_${{ env.DEVICE_NAME }}_${{ env.FILE_DATE }} path: | - ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-ext4-gpt_both0.bin - ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-ext4-boot.img - ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-ext4-system.img + ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-squashfs-gpt_both0.bin + ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-squashfs-boot.img + ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-squashfs-system.img ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3.manifest ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-flash.sh ${{ env.FIRMWARE }}/openwrt-msm89xx-msm8916-yiming-uz801v3-firmware.zip diff --git a/msm89xx/image/flash.sh b/msm89xx/image/flash.sh index 8a2d7a1..b69bb55 100644 --- a/msm89xx/image/flash.sh +++ b/msm89xx/image/flash.sh @@ -31,15 +31,15 @@ echo # Detect required OpenWrt images. echo "[*] Detecting OpenWrt images..." -gpt_path=$(find_image "$openwrt_dir" "*-gpt_both0.bin") || exit 1 +gpt_path=$(find_image "$openwrt_dir" "*-squashfs-gpt_both0.bin") || exit 1 boot_path=$(find_image "$openwrt_dir" "*-squashfs-boot.img") || exit 1 system_path=$(find_image "$openwrt_dir" "*-squashfs-system.img") || exit 1 -rootfs_data_path=$(find_image "$openwrt_dir" "*-rootfs_data.img") || exit 1 +# rootfs_data_path=$(find_image "$openwrt_dir" "*-rootfs_data.img") || exit 1 echo "[+] GPT: $(basename "$gpt_path")" echo "[+] Boot: $(basename "$boot_path")" echo "[+] Rootfs: $(basename "$system_path")" -echo "[+] Rootfs_data: $(basename "$rootfs_data_path")" +# echo "[+] Rootfs_data: $(basename "$rootfs_data_path")" # Detect firmware ZIP and extract .mbn files. echo diff --git a/msm89xx/image/generate_rootfs_data.sh b/msm89xx/image/generate_rootfs_data.sh deleted file mode 100755 index 614fc85..0000000 --- a/msm89xx/image/generate_rootfs_data.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -e - -OUTFILE=${1:-rootfs_data.img} -SIZE_GB=${2:-1} # Tamaño en GB, por defecto 1GB -TMPRAWFILE=$(mktemp) -trap "rm -f $TMPRAWFILE" EXIT - -# Calcular tamaño en bytes -SIZE_BYTES=$((SIZE_GB * 1024 * 1024 * 1024)) -SIZE_SECTORS=$((SIZE_BYTES / 512)) -SIZE_MB=$((SIZE_BYTES / 1024 / 1024)) - -echo "Creating rootfs_data image:" -echo " Size: ${SIZE_MB} MB (${SIZE_SECTORS} sectors, ${SIZE_GB} GB)" - -# Crear imagen raw del tamaño completo -truncate -s $SIZE_BYTES "$TMPRAWFILE" - -# Formatear como ext4 con label rootfs_data -mkfs.ext4 -F -L rootfs_data "$TMPRAWFILE" > /dev/null 2>&1 - -# Convertir a formato sparse de Android -img2simg "$TMPRAWFILE" "$OUTFILE" - -echo "Rootfs_data image created: $OUTFILE" diff --git a/msm89xx/image/generate_gpt.sh b/msm89xx/image/generate_squahsfs_gpt.sh similarity index 100% rename from msm89xx/image/generate_gpt.sh rename to msm89xx/image/generate_squahsfs_gpt.sh diff --git a/msm89xx/image/msm8916.mk b/msm89xx/image/msm8916.mk index 2e290a8..cc24514 100644 --- a/msm89xx/image/msm8916.mk +++ b/msm89xx/image/msm8916.mk @@ -2,9 +2,9 @@ ifeq ($(SUBTARGET),msm8916) -define Build/generate-gpt - chmod +x $(TOPDIR)/target/linux/$(BOARD)/image/generate_gpt.sh - $(TOPDIR)/target/linux/$(BOARD)/image/generate_gpt.sh $@ +define Build/generate-squashfs-gpt + chmod +x $(TOPDIR)/target/linux/$(BOARD)/image/generate_squahsfs_gpt.sh + $(TOPDIR)/target/linux/$(BOARD)/image/generate_squahsfs_gpt.sh $@ endef define Build/install-flasher @@ -34,14 +34,13 @@ define Device/yiming-uz801v3 DEVICE_MODEL := uz801v3 FILESYSTEMS := squashfs DEVICE_PACKAGES := uz801-tweaks wpad-basic-wolfssl rmtfs msm8916-usb-gadget \ - block-mount f2fs-tools prepare-rootfs-data rootfs-resizer \ - msm-firmware-dumper msm8916-wcnss-firmware msm8916-wcnss-nv msm8916-modem-firmware + block-mount f2fs-tools prepare-rootfs-data \ + msm8916-wcnss-firmware msm8916-wcnss-nv msm8916-modem-firmware IMAGE/system.img := append-rootfs | append-metadata | sparse-img - ARTIFACTS := gpt_both0.bin flash.sh firmware.zip rootfs_data.img - ARTIFACT/gpt_both0.bin := generate-gpt + ARTIFACTS := squashfs-gpt_both0.bin flash.sh firmware.zip + ARTIFACT/squashfs-gpt_both0.bin := generate-squashfs-gpt ARTIFACT/flash.sh := install-flasher ARTIFACT/firmware.zip := generate-firmware - ARTIFACT/rootfs_data.img := generate-empty-rootfs-data endef TARGET_DEVICES += yiming-uz801v3 diff --git a/packages/msm-firmware-dumper/Makefile b/packages/msm-firmware-dumper/Makefile index 46a8797..b678eb3 100644 --- a/packages/msm-firmware-dumper/Makefile +++ b/packages/msm-firmware-dumper/Makefile @@ -11,7 +11,7 @@ define Package/$(PKG_NAME) SECTION:=utils CATEGORY:=Utilities TITLE:=One-shot dump of Qualcomm firmware partitions into /lib/firmware - DEPENDS:=@TARGET_ROOTFS_EXT4FS +kmod-fs-vfat +kmod-fs-ext4 +kmod-nls-cp437 +kmod-nls-iso8859-1 + DEPENDS:=+kmod-fs-vfat +kmod-fs-ext4 +kmod-nls-cp437 +kmod-nls-iso8859-1 endef define Build/Configure diff --git a/packages/msm8916-firmware/Makefile b/packages/msm8916-firmware/Makefile index a069735..063da41 100644 --- a/packages/msm8916-firmware/Makefile +++ b/packages/msm8916-firmware/Makefile @@ -19,7 +19,6 @@ include $(INCLUDE_DIR)/package.mk define Package/firmware-default SECTION:=firmware CATEGORY:=Firmware - DEPENDS:=@TARGET_ROOTFS_SQUASHFS endef define Build/Compile