From c8331574de37c5678a8d930ad4c9de7a465ccd64 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 5 Nov 2023 11:14:02 +0100
Subject: [PATCH] v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/extras/nexmon.yml |  6 +++---
 builder/raspberrypi32.yml | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/builder/extras/nexmon.yml b/builder/extras/nexmon.yml
index 879b5418..0b286899 100644
--- a/builder/extras/nexmon.yml
+++ b/builder/extras/nexmon.yml
@@ -10,7 +10,7 @@
     executable: /bin/bash
     chdir: /usr/local/src/nexmon/
 
-- name: make firmware patch
+- name: "make firmware patch ({{ item.patch }})"
   shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/{{ item.patch }}/nexmon/ && make"
   args:
     executable: /bin/bash
@@ -19,7 +19,7 @@
     QEMU_UNAME: "{{ item.kernel }}"
     ARCHFLAGS: "{{ item.arch_flags }}"
 
-- name: install new firmware (bcm43455c0)
+- name: install new firmware
   copy:
     src: "/usr/local/src/nexmon/patches/{{ item.patch }}/nexmon/{{ item.firmware }}"
     dest: "/usr/lib/firmware/brcm/{{ item.firmware }}"
@@ -37,4 +37,4 @@
     dest: "/usr/lib/modules/{{ item.kernel }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko"
 
 - name : load brcmfmac drivers
-  command: "/sbin/depmod -a {{ item.kernel}}"
+  command: "/sbin/depmod -a {{ item.kernel }}"
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index 60c46716..312d1f94 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -396,13 +396,20 @@
       register: pwngrid
 
     - name: install pwngrid 1.10.4
-      shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && make && make install"
+      shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && make "
+      retries: 7
+      delay: 60
+      args:
+        executable: /bin/bash
+        chdir: /usr/local/src/pwngrid
+
+    - name: install pwngrid 1.10.4
+      shell: "export GOPATH=$HOME/go && export PATH=/usr/local/go/bin:$PATH:$GOPATH/bin && make install"
       retries: 7
       delay: 60
       args:
         executable: /bin/bash
         chdir: /usr/local/src/pwngrid
-      when: pwngrid.changed
 
     - name: remove pwngrid folder
       file: