From e1be0f7674ed77b1910f3cbd12a90a28cc213451 Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 5 Feb 2024 10:01:12 -0500 Subject: [PATCH 1/3] Remove unnecessary clean-up step in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f10ad8d..4dfd756e 100644 --- a/Makefile +++ b/Makefile @@ -64,5 +64,5 @@ pwnagotchi: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/raspberrypi64.yml $ image: pwnagotchi clean: - - rm -rf build dist pwnagotchi.egg-info + - rm -rf dist pwnagotchi.egg-info - rm -f $(PACKER) From 12fd081ae06e9582a980df81ec21260f94c41580 Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 5 Feb 2024 10:09:57 -0500 Subject: [PATCH 2/3] Update required_plugins in pwnagotchi.json.pkr.hcl --- builder/pwnagotchi.json.pkr.hcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/pwnagotchi.json.pkr.hcl b/builder/pwnagotchi.json.pkr.hcl index c08ff651..faa09ef2 100644 --- a/builder/pwnagotchi.json.pkr.hcl +++ b/builder/pwnagotchi.json.pkr.hcl @@ -2,10 +2,10 @@ # https://github.com/mkaczanowski/packer-builder-arm/pull/172 packer { required_plugins { - #arm = { - # version = "~> 1" - # source = "github.com/cdecoux/builder-arm" - #} + arm = { + version = "~> 1" + source = "github.com/cdecoux/builder-arm" + } ansible = { source = "github.com/hashicorp/ansible" version = "~> 1" From c882d0b67af3b71f4588f1146c72c1590d57b3c6 Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 5 Feb 2024 10:29:01 -0500 Subject: [PATCH 3/3] Update arm plugin source in pwnagotchi.json.pkr.hcl --- builder/pwnagotchi.json.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/pwnagotchi.json.pkr.hcl b/builder/pwnagotchi.json.pkr.hcl index faa09ef2..f2d6c098 100644 --- a/builder/pwnagotchi.json.pkr.hcl +++ b/builder/pwnagotchi.json.pkr.hcl @@ -4,7 +4,7 @@ packer { required_plugins { arm = { version = "~> 1" - source = "github.com/cdecoux/builder-arm" + source = "github.com/cdecoux/packer-plugin-builder-arm" } ansible = { source = "github.com/hashicorp/ansible"