From 112ec7b4a24f4d0ceecfe4336757353f06e4888f Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Fri, 15 Dec 2023 11:25:57 +0100
Subject: [PATCH] Update for bookworm release

---
 .idea/misc.xml            |  2 +-
 builder/raspberrypi32.yml | 20 ++++++++------------
 builder/raspberrypi64.yml |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b182fa76..b322db3a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.11 (pwnagotchi)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pwnagotchi-torch)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pwnagotchi-torch-bookworm)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index 741c1607..543b1d65 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -336,16 +336,6 @@
       git:
         repo: https://github.com/jayofelony/pwnagotchi-torch.git
         dest: /usr/local/src/pwnagotchi
-      register: pwnagotchigit
-
-    # is this even necessary? Can't we just link from /home/pi/pwnagotchi to /usr/local/{bin,lib,etc}
-    # then just git update in the home dir and encourage hacking?
-    # make owned by pi.pi, and custom plugins.
-    - name: build pwnagotchi wheel
-      command: "python3 setup.py sdist bdist_wheel"
-      args:
-        chdir: /usr/local/src/pwnagotchi
-      when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
     - name: download torch whl
       get_url:
@@ -360,14 +350,20 @@
     - name: install 32-bit pwnagotchi wheel and dependencies with 32-bit torch wheels
       pip:
         name:
-          - "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
           - "{{ packages.torch.url }}"
           - "{{ packages.torchvision.url }}"
         extra_args: "--no-cache-dir --break-system-packages"
       environment:
         QEMU_CPU: arm1176
         QEMU_UNAME: "{{ kernel.full }}"
-      when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
+
+    - name: build pwnagotchi wheel
+      command: "pip install . --no-cache-dir --break-system-packages"
+      args:
+        chdir: /usr/local/src/pwnagotchi
+      environment:
+        QEMU_CPU: arm1176
+        QEMU_UNAME: "{{ kernel.full }}"
 
     - name: create /usr/local/share/pwnagotchi/ folder
       file:
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 9e85d3c1..cb25403c 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -342,7 +342,7 @@
         dest: /usr/local/src/pwnagotchi
 
     - name: build pwnagotchi wheel
-      command: "pip install . --break-system-packages"
+      command: "pip install . --no-cache-dir --break-system-packages"
       args:
         chdir: /usr/local/src/pwnagotchi