From de0a09e39d01ab052a89ae684229659888f2539d Mon Sep 17 00:00:00 2001 From: jayofelony Date: Mon, 1 Jul 2024 20:15:45 +0200 Subject: [PATCH] Update build Signed-off-by: jayofelony --- Makefile | 1 - builder/combined.json.pkr.hcl | 6 ++++-- builder/raspberrypi32.json.pkr.hcl | 7 +++++-- builder/raspberrypi64.json.pkr.hcl | 5 ++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e8073469..438a1213 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,6 @@ packer: curl https://releases.hashicorp.com/packer/$(PACKER_VERSION)/packer_$(PACKER_VERSION)_linux_amd64.zip -o /tmp/packer.zip unzip -o /tmp/packer.zip -d /tmp sudo mv /tmp/packer /usr/bin/packer - /usr/bin/packer plugins install github.com/solo-io/arm-image image: packer export LC_ALL=en_GB.UTF-8 diff --git a/builder/combined.json.pkr.hcl b/builder/combined.json.pkr.hcl index c9ce1bd6..1371c5d9 100644 --- a/builder/combined.json.pkr.hcl +++ b/builder/combined.json.pkr.hcl @@ -1,5 +1,9 @@ packer { required_plugins { + arm-image = { + source = "github.com/solo-io/arm-image" + version = ">= 0.0.1" + } ansible = { source = "github.com/hashicorp/ansible" version = ">= 1.1.1" @@ -22,7 +26,6 @@ source "arm-image" "rpi64-pwnagotchi" { output_filename = "../../../pwnagotchi-64bit.img" qemu_binary = "qemu-aarch64-static" target_image_size = 9969908736 - last_partition_extra_size = 9221225472 } source "arm-image" "rpi32-pwnagotchi" { @@ -34,7 +37,6 @@ source "arm-image" "rpi32-pwnagotchi" { qemu_args = ["-cpu", "arm1176"] image_arch = "arm" target_image_size = 9969908736 - last_partition_extra_size = 9221225472 } # a build block invokes sources and runs provisioning steps on them. The diff --git a/builder/raspberrypi32.json.pkr.hcl b/builder/raspberrypi32.json.pkr.hcl index 1e2f0a55..621940db 100644 --- a/builder/raspberrypi32.json.pkr.hcl +++ b/builder/raspberrypi32.json.pkr.hcl @@ -1,5 +1,9 @@ packer { required_plugins { + arm-image = { + source = "github.com/solo-io/arm-image" + version = ">= 0.0.1" + } ansible = { source = "github.com/hashicorp/ansible" version = ">= 1.1.1" @@ -24,8 +28,7 @@ source "arm-image" "rpi32-pwnagotchi" { qemu_args = ["-cpu", "arm1176"] image_arch = "arm" image_mounts = ["/boot/firmware","/"] - target_image_size = 9969908736 - last_partition_extra_size = 9221225472 + target_image_size = 19969908736 } build { diff --git a/builder/raspberrypi64.json.pkr.hcl b/builder/raspberrypi64.json.pkr.hcl index de17dd71..0117a605 100644 --- a/builder/raspberrypi64.json.pkr.hcl +++ b/builder/raspberrypi64.json.pkr.hcl @@ -1,5 +1,9 @@ packer { required_plugins { + arm-image = { + source = "github.com/solo-io/arm-image" + version = ">= 0.0.1" + } ansible = { source = "github.com/hashicorp/ansible" version = ">= 1.1.1" @@ -22,7 +26,6 @@ source "arm-image" "rpi64-pwnagotchi" { output_filename = "../../../pwnagotchi-64bit.img" qemu_binary = "qemu-aarch64-static" target_image_size = 9969908736 - last_partition_extra_size = 9221225472 } # a build block invokes sources and runs provisioning steps on them. The