From d92ecc7f0c7c24064c3fb089aa247624ce981db8 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Thu, 9 Nov 2023 21:17:11 +0100
Subject: [PATCH] v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 Makefile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 994ba760..348b428e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 PACKER_VERSION := 1.9.4
 PWN_HOSTNAME := pwnagotchi
 PWN_VERSION := $(shell cut -d"'" -f2 < pwnagotchi/_version.py)
+PWN_RELEASE := pwnagotchi-raspios-lite-$(PWN_VERSION)
 
 MACHINE_TYPE := $(shell uname -m)
 ifneq (,$(filter x86_64,$(MACHINE_TYPE)))
@@ -33,27 +34,25 @@ langs:
 		./scripts/language.sh compile $$(basename $$lang); \
 	done
 
-image:
-	PACKER := /tmp/pwnagotchi/packer
-	PACKER_URL := https://releases.hashicorp.com/packer/$(PACKER_VERSION)/packer_$(PACKER_VERSION)_linux_$(GOARCH).zip
-	$(PACKER):
-		mkdir -p $(@D)
-		curl -L "$(PACKER_URL)" -o $(PACKER).zip
-		unzip $(PACKER).zip -d $(@D)
-		rm $(PACKER).zip
-		chmod +x $@
+PACKER := /tmp/pwnagotchi/packer
+PACKER_URL := https://releases.hashicorp.com/packer/$(PACKER_VERSION)/packer_$(PACKER_VERSION)_linux_$(GOARCH).zip
+$(PACKER):
+	mkdir -p $(@D)
+	curl -L "$(PACKER_URL)" -o $(PACKER).zip
+	unzip $(PACKER).zip -d $(@D)
+	rm $(PACKER).zip
+	chmod +x $@
 
-	SDIST := dist/pwnagotchi-$(PWN_VERSION).tar.gz
-	$(SDIST): setup.py pwnagotchi
-		python3 setup.py sdist
+$(PWN_RELEASE).img: | $(PACKER)
+	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
 
-	# Building the image requires packer, but don't rebuild the image just because packer updated.
-	$(PWN_RELEASE).img: | $(PACKER)
-		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
+.PHONY: image
+image: $(PWN_RELEASE).zip
 
 clean:
 	- python3 setup.py clean --all
 	- rm -rf dist pwnagotchi.egg-info
 	- rm -f $(PACKER)
+	- rm -f $(PWN_RELEASE).*
 	- sudo rm -rf builder/output-pwnagotchi builder/packer_cache