From ca3e7960ea2abb9e448610c633dc92d7786ce8ab Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Fri, 24 Feb 2023 13:30:28 -0800
Subject: [PATCH 1/3] remove 'out/' prefix in manifest.txt

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2569eba..049e317 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ $(OUT_DIR)/manifest.txt: | $(OUT_DIR)
 		-type f \
 		-not -path "$(OUT_DIR)/manifest.txt" \
 		-exec openssl sha256 -r {} \; \
-	| sed -e 's/ \*/ /g' -e 's/ \.\// /g' \
+	| sed -e 's/ \*out\// /g' -e 's/ \.\// /g' \
 	| LC_ALL=C sort -k2 \
 	> $@
 

From 2e67bce822f6a072e3444758ebdc8b31788e3fd5 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Fri, 24 Feb 2023 13:42:59 -0800
Subject: [PATCH 2/3] only depend on toolchain.state in global 'toolchain'
 phony

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 049e317..9501da2 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,6 @@ toolchain: \
 	$(DIST_DIR) \
 	$(BIN_DIR) \
 	$(OUT_DIR) \
-	$(CACHE_DIR_ROOT)/toolchain.tar \
 	$(CACHE_DIR_ROOT)/toolchain.state \
 	$(CACHE_DIR_ROOT)/toolchain.env
 

From 64b677d2353b0313f5f0b1561686905ceb90747e Mon Sep 17 00:00:00 2001
From: Jack Kearney <jack@turnkey.io>
Date: Fri, 24 Feb 2023 16:56:39 -0500
Subject: [PATCH 3/3] Follow symlinks while building manifest.txt

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9501da2..5fb6bc7 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ $(OUT_DIR)/release.env: | $(OUT_DIR)
 	echo 'GIT_TIMESTAMP=$(GIT_TIMESTAMP)' >> $(OUT_DIR)/release.env
 
 $(OUT_DIR)/manifest.txt: | $(OUT_DIR)
-	find $(OUT_DIR) \
+	find -L $(OUT_DIR) \
 		-type f \
 		-not -path "$(OUT_DIR)/manifest.txt" \
 		-exec openssl sha256 -r {} \; \