From 488968ba7f72be733a5138ea59e69f5b87d1755d Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 8 Feb 2024 20:18:58 +0100 Subject: [PATCH] Revert "update Makefile" This reverts commit 9a40567d --- Makefile | 6 +++++- builder/raspberrypi64.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fd796371..898da0ea 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,15 @@ $(PACKER): rm $(PACKER).zip chmod +x $@ +SDIST := dist/pwnagotchi-$(PWN_VERSION).tar.gz +$(SDIST): setup.py pwnagotchi + python3 setup.py sdist + # Building the image requires packer, but don't rebuild the image just because packer updated. pwnagotchi: | $(PACKER) # If the packer or ansible files are updated, rebuild the image. -pwnagotchi: builder/pwnagotchi.json.pkr.hcl builder/raspberrypi64.yml $(shell find builder/data -type f) +pwnagotchi: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/raspberrypi64.yml $(shell find builder/data -type f) cd builder && $(PACKER) init pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" pwnagotchi.json.pkr.hcl diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml index 6b7e8973..12f47e74 100644 --- a/builder/raspberrypi64.yml +++ b/builder/raspberrypi64.yml @@ -40,11 +40,11 @@ source: "https://github.com/jayofelony/caplets.git" bettercap: source: "https://github.com/jayofelony/bettercap.git" - url: "https://github.com/jayofelony/bettercap/releases/download/v2.32.4/bettercap-2.32.4-aarch64.zip" + url: "https://github.com/jayofelony/bettercap/releases/download/2.32.2/bettercap-2.32.2.zip" ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip" pwngrid: source: "https://github.com/jayofelony/pwngrid.git" - url: "https://github.com/jayofelony/pwngrid/releases/download/v1.11.0/pwngrid-1.11.0-aarch64.zip" + url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.5/pwngrid-1.10.5-aarch64.zip" apt: downgrade: - libpcap-dev_1.9.1-4_arm64.deb