From 3dd09f447c1f82071a4bf9ddcad6babf66825c0c Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sat, 21 Oct 2023 08:21:22 +0200
Subject: [PATCH] v2.5.0

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/pwnagotchi.json | 8 ++++----
 builder/pwnagotchi.yml  | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json
index 40707c01..1a3befc4 100644
--- a/builder/pwnagotchi.json
+++ b/builder/pwnagotchi.json
@@ -3,13 +3,13 @@
     {
       "name": "pwnagotchi",
       "type": "arm-image",
-      "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz",
-      "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256",
+      "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64-lite.img.xz",
+      "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64-lite.img.xz.sha256",
       "target_image_size": 8568709120,
       "qemu_binary": "qemu-aarch64-static",
-      "output_filename": "../../pwnagotchi-{{user `pwn_version`}}-arm64.img",
+      "output_filename": "../../pwnagotchi-{{user `pwn_version`}}-bookworm-arm64.img",
       "qemu_args": [
-        "-r", "6.1.21-v8+"
+        "-r", "6.1.0-rpi4-rpi-v8"
       ]
     }
   ],
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 531cccc0..33b3a950 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -6,7 +6,7 @@
   vars:
     kernel:
       min: "6.1"
-      full: "6.1.21-v8+"
+      full: "6.1.0-rpi4-rpi-v8"
     pwnagotchi:
       hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
       version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
@@ -27,7 +27,6 @@
         - fstrim.timer
         - pwnagotchi.service
         - pwngrid-peer.service
-        - rfkill-unblock@all
       disable:
         - apt-daily-upgrade.service
         - apt-daily-upgrade.timer
@@ -71,6 +70,7 @@
           - bluez
           - build-essential
           - curl
+          - dhcpcd5
           - dkms
           - dphys-swapfile
           - fbi
@@ -84,8 +84,6 @@
           - gcc-arm-none-eabi
           - git
           - libatlas-base-dev
-          - libavcodec58
-          - libavformat58
           - libblas-dev
           - libbz2-dev
           - libc-ares-dev
@@ -118,7 +116,7 @@
           - libsqlite3-dev
           - libssl-dev
           - libswscale5
-          - libtiff5
+          - libtiff6
           - libtool
           - libusb-1.0-0-dev
           - lsof