From 0627f3ed3f0eeca5ebd8cd376f0d9719c888f4fa Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Thu, 2 Nov 2023 20:01:06 +0100
Subject: [PATCH] v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 builder/data/etc/dhcpcd.conf |  2 +-
 builder/orangepi.yml         | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/builder/data/etc/dhcpcd.conf b/builder/data/etc/dhcpcd.conf
index 2bdc46b1..95c71a3a 100644
--- a/builder/data/etc/dhcpcd.conf
+++ b/builder/data/etc/dhcpcd.conf
@@ -45,7 +45,7 @@ slaac private
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 # static IP configuration:
-# denyinterfaces wlan0
+denyinterfaces wlan0
 
 interface eth0
 static domain_name_servers=8.8.8.8 1.1.1.1
diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index 831f4b70..a6c45a74 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -6,7 +6,7 @@
   vars:
     kernel:
       min: "6.1"
-      full: "6.1.21-v8+"
+      full: "6.1.31-sun50iw9"
     pwnagotchi:
       hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
       version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
@@ -23,11 +23,11 @@
         - "g_ether"
     services:
       enable:
-        - bettercap.service
+        #- bettercap.service
         - dphys-swapfile.service
         - fstrim.timer
-        - pwnagotchi.service
-        - pwngrid-peer.service
+        #- pwnagotchi.service
+        #- pwngrid-peer.service
       disable:
         - apt-daily-upgrade.service
         - apt-daily-upgrade.timer
@@ -36,7 +36,7 @@
         - avahi-daemon.service
         - avahi-daemon.socket
         - bluetooth.service
-        - ifup@wlan0.service
+        #- ifup@wlan0.service
         - rpi-eeprom-update.service
         - triggerhappy.service
         - wpa_supplicant.service
@@ -150,6 +150,7 @@
           - zlib1g-dev
   environment:
     ARCHFLAGS: "-arch aarch64"
+    QEMU_UNAME: "{{ kernel.full }}"
 
   tasks:
     - name: Create user=pi, pass=orange