From 76886ffe44a9085538f65f01f4a544286989def6 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 15 Jul 2022 22:30:37 +0200
Subject: [PATCH] - target-rootfs: fix apollo/shiner rootfs tarball creation

---
 make/environment-image.mk | 4 ++--
 make/target-rootfs.mk     | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/make/environment-image.mk b/make/environment-image.mk
index 89b02ed5..b4f495d7 100644
--- a/make/environment-image.mk
+++ b/make/environment-image.mk
@@ -7,8 +7,8 @@
 DEBUG ?= no
 
 # Versioning
-GITTAG=$(shell git tag -l "NI-*" | tail -n1)
-GITREV=$(shell git rev-list $(GITTAG)..HEAD --count)
+GITTAG = $(shell git tag -l "NI-*" | tail -n1)
+GITREV = $(shell git rev-list $(GITTAG)..HEAD --count)
 
 # *Must* be a one-digit number
 IMAGE_VERSION_MAJOR = 4
diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk
index cdc91250..91f603a5 100644
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@@ -163,6 +163,15 @@ ROOTFS_TARBALL_EXCLUDE = \
 rootfs-tarball: $(ROOTFS_TARBALL)
 $(ROOTFS_TARBALL):
 	tar czf $(@) -C $(ROOTFS) $(foreach exclude,$(ROOTFS_TARBALL_EXCLUDE),--exclude='$(exclude)' ) .
+ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner))
+  ifeq ($(BOXMODEL),apollo)
+	# create rootfs tarball for shiner too when building apollo
+	$(INSTALL_COPY) $(@) $(subst apollo,shiner,$(@))
+  else ifeq ($(BOXMODEL),shiner)
+	# create rootfs tarball for apollo too when building shiner
+	$(INSTALL_COPY) $(@) $(subst shiner,apollo,$(@))
+  endif
+endif
 
 # -----------------------------------------------------------------------------