From f0fa2222151f5bfddff5d10c8367d8431e9615cc Mon Sep 17 00:00:00 2001 From: Austin English Date: Tue, 23 Mar 2021 02:56:05 -0500 Subject: [PATCH] scripts/BuildScripts/BuildCommon.mk: don't include the gitsha in the base image name But do use the target arch, so side by side builds are still possible. --- .gitignore | 3 ++- scripts/BuildScripts/BuildCommon.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4a855e2..1970b94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ build -CrawfishOS-Shiba-* +CrawfishOS-*BASE +CrawfishOS-*img* PrawnOS-initramfs.cpio.gz PrawnOS-Shiba-* .*.swp diff --git a/scripts/BuildScripts/BuildCommon.mk b/scripts/BuildScripts/BuildCommon.mk index 83b0466..cf0b167 100644 --- a/scripts/BuildScripts/BuildCommon.mk +++ b/scripts/BuildScripts/BuildCommon.mk @@ -122,7 +122,7 @@ PRAWNOS_IMAGE := $(PRAWNOS_ROOT)/CrawfishOS-$(TARGET)-git-$(PRAWNOS_GIT_BRANCH)- endif PRAWNOS_IMAGE_GIT_GZ := $(PRAWNOS_IMAGE).gz -PRAWNOS_IMAGE_BASE := $(PRAWNOS_IMAGE)-BASE +PRAWNOS_IMAGE_BASE := CrawfishOS-$(TARGET)-BASE ### BUILD SCRIPTS PRAWNOS_BUILD_SCRIPTS := $(PRAWNOS_SCRIPTS)/BuildScripts