diff --git a/Makefile b/Makefile index f2651bc2..469956a0 100644 --- a/Makefile +++ b/Makefile @@ -46,18 +46,15 @@ packer: sudo mv /tmp/packer /usr/bin/packer image: clean packer - export LC_ALL=en_GB.utf-8 cd builder && sudo /usr/bin/packer init combined.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" combined.json.pkr.hcl bullseye: clean packer - export LC_ALL=en_GB.utf-8 cd builder && sudo /usr/bin/packer init data/32bit/pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/32bit/pwnagotchi.json.pkr.hcl - cd ~ && sudo pishrink -vaZ pwnagotchi-32bit.img + sudo pishrink -vaZ pwnagotchi-32bit.img bookworm: clean packer - export LC_ALL=en_GB.utf-8 cd builder && sudo /usr/bin/packer init data/64bit/pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) /usr/bin/packer build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" data/64bit/pwnagotchi.json.pkr.hcl - cd ~ && sudo pishrink -vaZ pwnagotchi-64bit.img + sudo pishrink -vaZ pwnagotchi-64bit.img clean: - rm -rf /tmp/packer* diff --git a/builder/data/32bit/pwnagotchi.json.pkr.hcl b/builder/data/32bit/pwnagotchi.json.pkr.hcl index 5545c9af..0fc0aabe 100644 --- a/builder/data/32bit/pwnagotchi.json.pkr.hcl +++ b/builder/data/32bit/pwnagotchi.json.pkr.hcl @@ -6,7 +6,7 @@ packer { } ansible = { source = "github.com/hashicorp/ansible" - version = "~> 1" + version = ">= 1.1.1" } } } diff --git a/builder/data/64bit/pwnagotchi.json.pkr.hcl b/builder/data/64bit/pwnagotchi.json.pkr.hcl index c5f44397..2dbe0cb5 100644 --- a/builder/data/64bit/pwnagotchi.json.pkr.hcl +++ b/builder/data/64bit/pwnagotchi.json.pkr.hcl @@ -6,7 +6,7 @@ packer { } ansible = { source = "github.com/hashicorp/ansible" - version = "~> 1" + version = ">= 1.1.1" } } }