From a1e4f6ef8cfd59d255f1bdf4fe94fc37f2df5d17 Mon Sep 17 00:00:00 2001 From: Luxferre Date: Sun, 25 Oct 2026 07:24:08 +0200 Subject: [PATCH] build: drop redundant .sparse.img generation and update docs --- MANUAL.md | 7 +++---- README.md | 5 ++--- rebuild-image.sh | 10 +++------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/MANUAL.md b/MANUAL.md index 6ac3d59..e1dd8fc 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -13,8 +13,7 @@ This manual covers flashing, operating, and customizing **Bananarchy Linux** (Sx ## 1. System overview & workspace contents ### 1.1 System images (`images/`) -- `images/bananarchy-nokia-argon.img` — raw partitioned image (`256 MiB` `ext2` `pmOS_boot` + `ext4` `pmOS_root`) ready for EDL flashing to `userdata` or raw `dd` to a microSD card. -- `images/bananarchy-nokia-argon.sparse.img` — Android sparse image for `fastboot flash userdata`. +- `images/bananarchy-nokia-argon.img` — partitioned image (`256 MiB` `ext2` `pmOS_boot` + `ext4` `pmOS_root`) ready for EDL flashing to `userdata`, `fastboot flash userdata`, or raw `dd` to a microSD card. - `images/boot-bananarchy-nokia-argon.img` — standalone Android `boot.img` with Linux `6.12.1-msm8916`, initramfs, and appended DTB. - Additional device images (`bananarchy-nokia-beatles.img`, `bananarchy-nokia-tough.img`, `bananarchy-nokia-sparkler.img`) can be generated at any time via `./rebuild-image.sh --mkinitfs`. @@ -65,9 +64,9 @@ The script will: ### Method B: Fastboot flashing (once `lk2nd` is installed) 1. Hold **D-Pad up** while powering on the phone to enter `lk2nd` Fastboot mode. -2. Flash the sparse system image to `userdata`: +2. Flash the system image to `userdata`: ```bash - fastboot flash userdata ./images/bananarchy-nokia-argon.sparse.img + fastboot flash userdata ./images/bananarchy-nokia-argon.img fastboot erase system fastboot reboot ``` diff --git a/README.md b/README.md index 85e9421..c475ed8 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ bananarchy/ ├── MANUAL.md # Complete flashing, keypad, plugin, T9, camera, and modem manual ├── flash-edl.sh # Automated USB EDL flasher wrapper (sudo + ModemManager handling) ├── flash-edl.py # Multi-device Qualcomm Sahara/Firehose EDL flasher -├── rebuild-image.sh # Builds boot.img, MBR raw .img, and Android .sparse.img +├── rebuild-image.sh # Builds boot.img and partitioned MBR .img ├── chroot-shell.sh # Rootless Docker armv7 package & rootfs customization shell ├── artwork/ # Bananarchy master icon, generated icons, wallpapers, and splashes ├── bootloader/ # lk2nd secondary bootloader and Sahara/Firehose programmer (8110.mbn) @@ -130,8 +130,7 @@ All components are pre-compiled in `prebuilt/` and `overlay/rootfs/`, and can be ./rebuild-image.sh nokia-sparkler --mkinitfs ``` Output images are written to `images/`: -- `images/bananarchy-.img` (raw partitioned MBR image for EDL `userdata` or microSD card) -- `images/bananarchy-.sparse.img` (Android sparse image for `fastboot flash userdata`) +- `images/bananarchy-.img` (partitioned MBR image for EDL `userdata`, `fastboot flash userdata`, or microSD card) - `images/boot-bananarchy-.img` (kernel + initramfs + DTB boot image) --- diff --git a/rebuild-image.sh b/rebuild-image.sh index db1f27c..bfc1e7e 100755 --- a/rebuild-image.sh +++ b/rebuild-image.sh @@ -244,11 +244,10 @@ EOF rm -rf "$ROOTFS/boot" mv "$SAVED_BOOT" "$ROOTFS/boot" - echo "[4/5] Assembling partitioned MBR raw image and Android sparse image..." + echo "[4/5] Assembling partitioned MBR raw image..." RAW_IMG="/images/bananarchy-$TARGET_DEVICE.img" - SPARSE_IMG="/images/bananarchy-$TARGET_DEVICE.sparse.img" TOTAL_MB=$(( 1 + BOOT_MB + ROOT_MB )) - rm -f "$RAW_IMG" "$SPARSE_IMG" + rm -f "$RAW_IMG" "/images/bananarchy-$TARGET_DEVICE.sparse.img" "/images/nokia-argon-sxmo.sparse.img" truncate -s "${TOTAL_MB}M" "$RAW_IMG" BOOT_SECTORS=$(( BOOT_MB * 2048 )) @@ -266,11 +265,8 @@ SFEOF dd if="$ROOT_IMG" of="$RAW_IMG" bs=1M seek=$(( 1 + BOOT_MB )) conv=notrunc,sparse status=none rm -f "$BOOT_IMG" "$ROOT_IMG" - img2simg "$RAW_IMG" "$SPARSE_IMG" - if [ "$TARGET_DEVICE" = "nokia-argon" ]; then ln -f "$RAW_IMG" "/images/nokia-argon-sxmo.img" - ln -f "$SPARSE_IMG" "/images/nokia-argon-sxmo.sparse.img" fi echo "[5/5] Restoring host user ownership on $ROOTFS for easy host editing..." @@ -278,5 +274,5 @@ SFEOF chmod -R u+rwX "$ROOTFS" echo "Built Bananarchy images for $TARGET_DEVICE:" - ls -lh "/images/boot-bananarchy-$TARGET_DEVICE.img" "$RAW_IMG" "$SPARSE_IMG" + ls -lh "/images/boot-bananarchy-$TARGET_DEVICE.img" "$RAW_IMG" '