feat: add Xiaomi AX6000 support

Author: developsessions

.github/workflows/build.yml

@@ -20,9 +20,14 @@ jobs:
     - name: pip install
       run: pip install python-lzo ubi_reader
     - name: make
-      run: make
+      run: make all
 
     - uses: actions/upload-artifact@v3
       with:
-        name: miwifi_r3600_all_6510e_3.0.22_INT_SSH.bin
-        path: miwifi_r3600_all_6510e_3.0.22_INT_SSH.bin
+        name: miwifi_r3600_all_6510e_3.0.22_INT_AX3600_SSH.bin
+        path: miwifi_r3600_all_6510e_3.0.22_INT_AX3600_SSH.bin
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: miwifi_ra72_firmware_129d1_1.0.103_AX6000_SSH.bin
+        path: miwifi_ra72_firmware_129d1_1.0.103_AX6000_SSH.bin

Makefile

@@ -1,14 +1,27 @@
-FIRMWARES:=$(shell cd orig-firmwares; ls *.bin | sed 's/\.bin$$//')
-
-TARGETS_SSH:=$(patsubst %,%_SSH.bin,$(FIRMWARES))
-TARGETS:=$(shell echo $(TARGETS_SSH) | sed 's/ /\n/g' | sort)
-
-all: $(TARGETS)
-
-%_SSH.bin: orig-firmwares/%.bin repack-squashfs.sh
-	rm -f $@
-	-rm -rf ubifs-root/$*.bin
-	ubireader_extract_images -w orig-firmwares/$*.bin
-	fakeroot -- ./repack-squashfs.sh ubifs-root/$*.bin/img-*_vol-ubi_rootfs.ubifs cuong.ga 1234567890
-	./ubinize.sh ubifs-root/$*.bin/img-*_vol-kernel.ubifs ubifs-root/$*.bin/img-*_vol-ubi_rootfs.ubifs.new
-	mv r3600-raw-img.bin $@
+TARGETS_AX3600_SSH:=$(shell cd orig-firmwares/AX3600; ls *.bin | sed 's/\.bin$$/_AX3600_SSH.bin/')
+TARGETS_AX6000_SSH:=$(shell cd orig-firmwares/AX6000; ls *.bin | sed 's/\.bin$$/_AX6000_SSH.bin/')
+TARGETS_AX3600:=$(shell echo $(TARGETS_AX3600_SSH) | sed 's/ /\n/g' | sort)
+TARGETS_AX6000:=$(shell echo $(TARGETS_AX6000_SSH) | sed 's/ /\n/g' | sort)
+
+AX3600: $(TARGETS_AX3600)
+AX6000: $(TARGETS_AX6000)
+all: $(TARGETS_AX3600) $(TARGETS_AX6000)
+
+clean:
+	rm *.bin
+
+%_AX3600_SSH.bin: orig-firmwares/AX3600/%.bin repack-squashfs.sh
+	rm -f $@
+	-rm -rf ubifs-root/$*.bin
+	ubireader_extract_images -w orig-firmwares/AX3600/$*.bin
+	fakeroot -- ./repack-squashfs.sh ubifs-root/$*.bin/img-*_vol-ubi_rootfs.ubifs AX3600
+	./ubinize.sh ubifs-root/$*.bin/img-*_vol-kernel.ubifs ubifs-root/$*.bin/img-*_vol-ubi_rootfs.ubifs.new
+	mv r3600-raw-img.bin $@
+
+%_AX6000_SSH.bin: orig-firmwares/AX6000/%.bin repack-squashfs.sh
+	rm -f $@
+	-rm -rf ubifs-root/$*.bin
+	ubireader_extract_images -w orig-firmwares/AX6000/$*.bin
+	fakeroot -- ./repack-squashfs.sh ubifs-root/$*.bin/img-*_vol-ubi_rootfs.ubifs AX6000
+	./ubinize.sh ubifs-root/$*.bin/img-*_vol-kernel.ubifs ubifs-root/$*.bin/img-*_vol-ubi_rootfs.ubifs.new
+	mv r3600-raw-img.bin $@

README.md

@@ -1,7 +1,7 @@
 xqrepack
 =========
 
-These scripts allow you to modify the *Xiaomi R3600* firmware image to make sure SSH and UART access is always enabled.
+These scripts allow you to modify the *Xiaomi AX3600 and Xiaomi AX6000* firmware image to make sure SSH and UART access is always enabled.
 
 The default root password is `password`. Please remember to login to the router and change that after the upgrade. Your router settings like IP address and SSIDs are stored in the nvram and should stay the same.
 
@@ -17,7 +17,7 @@ Requirements
 You will need to install the following tools:
 
 - [ubi_reader](https://github.com/jrspruitt/ubi_reader)
-- ubinize
+- ubinize (mtd-utils)
 - unsquashfs / mksquashfs
 - fakeroot
 
@@ -26,19 +26,21 @@ Usage
 
 1. Download the firmware(s) from miwifi.com.
    It should be something like `miwifi_r3600_firmware_xxx_yyy.bin`.
-   Put it/them to `orig-firmwares` directory.
+   Put it/them to `orig-firmwares` in the specific router model directory.
+   E.g. for an AX3600 router copy the firmware to `orig-firmwares/AX3600`
 
 2. Run `make` to build archives of patched firmwares.
    This will build patched images with following naming convention:
-   - `<firmware_image_name>_SSH.zip`: patched with original `repack-squashfs.sh` script, which enables SSH and does its best to disable Xiaomi functions/bloatware
+   - `<firmware_image_name>_<ROUTER_MODEL>_SSH.bin`: patched with original `repack-squashfs.sh` script, which enables SSH and does its best to disable Xiaomi functions/bloatware
 
-3. After extracting a generated archive of your liking, you will get `r3600-raw-img.bin` file.
-   Flash this file directly into the router using SSH.
+3. Flash this file directly into the router using SSH.
    You cannot use the web UI because this is a raw image, and more importantly has no signature.
 
    If you are using a recently xqrepack'ed firmware, you can use the `xqflash` utility on the router to flash an update image:
 
-        xqflash /tmp/r3600-raw-img.bin
+        xqflash /tmp/r<firmware_image_name>_<ROUTER_MODEL>_SSH.bin
+
+   If you are using a original image, just copy xqrepack via scp to the router to prevent manual flashing.
 
    After it completes successfully, you should be able to `reboot`.
 
@@ -50,7 +52,7 @@ Manual Flashing
 
 The R3600 firmware uses an A/B partition system, called `rootfs` and `rootfs_1`. This corresponds to `mtd12` and `mtd13`. Find the partition that is not the one in use and use `ubiformat` to write the raw image onto the partition:
 
-    ubiformat /dev/mtd12 -f /tmp/r3600-raw-img.bin -s 2048 -O 2048
+    ubiformat /dev/mtd12 -f /tmp/<firmware_image_name>_<ROUTER_MODEL>_SSH.bin -s 2048 -O 2048
 
 Set the nvram variable to re-initialize `/etc` (and I think to switch partitions also):