From 209c3bd0af47405cfb677007e0747d03b4765215 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Sun, 12 Feb 2023 21:41:33 -0800
Subject: [PATCH] normalize all release vars

---
 Makefile                                    | 6 ++----
 config/buildroot/board/x86_64/post-build.sh | 3 +--
 config/buildroot/rootfs_overlay/etc/profile | 2 +-
 src/toolchain                               | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b9b2594..f887676 100644
--- a/Makefile
+++ b/Makefile
@@ -51,10 +51,8 @@ vm: toolchain
 
 .PHONY: release
 release: default
-	mkdir -p $(DIST_DIR)
-	cp $(OUT_DIR)/release.env $(DIST_DIR)/release.env
-	cp $(OUT_DIR)/airgap.iso $(DIST_DIR)/airgap.iso
-	cp $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt
+	rm -rf $(DIST_DIR)/*
+	cp -R $(OUT_DIR)/* $(DIST_DIR)/
 
 $(FETCH_DIR)/buildroot: toolchain
 	$(call git_clone,$(FETCH_DIR)/buildroot,$(BUILDROOT_REPO),$(BUILDROOT_REF))
diff --git a/config/buildroot/board/x86_64/post-build.sh b/config/buildroot/board/x86_64/post-build.sh
index 8747a90..36bfc81 100755
--- a/config/buildroot/board/x86_64/post-build.sh
+++ b/config/buildroot/board/x86_64/post-build.sh
@@ -11,7 +11,6 @@ cp -f ${BOARD_DIR}/grub.cfg ${TARGET_DIR}/boot/grub/grub.cfg
 echo "export GIT_REF=\"${GIT_REF}\"" > ${TARGET_DIR}/etc/environment
 echo "export GIT_AUTHOR=\"${GIT_AUTHOR}\"" >> ${TARGET_DIR}/etc/environment
 echo "export GIT_KEY=\"${GIT_KEY}\"" >> ${TARGET_DIR}/etc/environment
-echo "export GIT_DATETIME=\"${GIT_DATETIME}\"" >> ${TARGET_DIR}/etc/environment
-echo "export GIT_EPOCH=\"${GIT_EPOCH}\"" >> ${TARGET_DIR}/etc/environment
+echo "export GIT_TIMESTAMP=\"${GIT_TIMESTAMP}\"" >> ${TARGET_DIR}/etc/environment
 
 exit $?
diff --git a/config/buildroot/rootfs_overlay/etc/profile b/config/buildroot/rootfs_overlay/etc/profile
index e9418b8..30a829e 100644
--- a/config/buildroot/rootfs_overlay/etc/profile
+++ b/config/buildroot/rootfs_overlay/etc/profile
@@ -16,7 +16,7 @@ cat << "EOF"
 EOF
 echo " Build Details:"
 echo "  - Version: $VERSION"
-echo "  - Date: $GIT_DATETIME"
+echo "  - Date: $GIT_TIMESTAMP"
 echo "  - Tree State: $GIT_STATE"
 echo "  - Committer: $GIT_AUTHOR"
 echo "  - Commit: $GIT_REF"
diff --git a/src/toolchain b/src/toolchain
index 770c4ad..be41f7c 160000
--- a/src/toolchain
+++ b/src/toolchain
@@ -1 +1 @@
-Subproject commit 770c4add580c19ed9d9ead6a2ac765a397cb889c
+Subproject commit be41f7cfe1ea6331e17b8b3f4fffe2f509326e76