From f64ffe99e91c0bb4e43a3b91bfddf26903cafa45 Mon Sep 17 00:00:00 2001
From: "Sean P. Kelly" <seankell@amazon.com>
Date: Thu, 19 Sep 2024 22:43:44 +0000
Subject: [PATCH] install-twoliter: always use host arch for twoliter

If, when you first installed twoliter, you were building for a host
architecture that differed from your target, twoliter would use the
wrong checksum when validating the installed binary.
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 27e073083..60022d571 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,11 @@ TWOLITER_VERSION ?= "0.4.6"
 TWOLITER_SHA256_AARCH64 ?= "12ac3f5a6c641e29481c79289bd07cf1c3494a65e3d283d582feb1d28d8bf2a7"
 TWOLITER_SHA256_X86_64 ?= "4a2db7c4d0aac75c6b682336539ee57371cfb6dfea81689d07fc1f4a940fd5c5"
 KIT ?= bottlerocket-core-kit
-ARCH ?= $(shell uname -m)
+UNAME_ARCH = $(shell uname -m)
+ARCH ?= $(UNAME_ARCH)
 VENDOR ?= bottlerocket
 
-ifeq ($(ARCH), aarch64)
+ifeq ($(UNAME_ARCH), aarch64)
 	TWOLITER_SHA256=$(TWOLITER_SHA256_AARCH64)
 else
 	TWOLITER_SHA256=$(TWOLITER_SHA256_X86_64)