From 0e90e643ca4d8259f13d2b72088af2a573735b3f Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 27 Feb 2021 23:50:35 +0100
Subject: [PATCH] - splash-images: move files to support dir

---
 make/environment-build.mk                           |   1 +
 make/flash-images.mk                                |   6 +++---
 .../splash-images/ni-splash-hd6x.img                | Bin
 .../general => support}/splash-images/ni-splash.bmp | Bin
 .../general => support}/splash-images/ni-splash.h   |   0
 .../general => support}/splash-images/ni-splash.jpg | Bin
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename {skel-root/general => support}/splash-images/ni-splash-hd6x.img (100%)
 rename {skel-root/general => support}/splash-images/ni-splash.bmp (100%)
 rename {skel-root/general => support}/splash-images/ni-splash.h (100%)
 rename {skel-root/general => support}/splash-images/ni-splash.jpg (100%)

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 5d25627d..ebbc0fec 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -125,6 +125,7 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuz
 endif
 TARGET_FILES  = $(BASE_DIR)/skel-root/general
 PACKAGE_DIR   = $(BASE_DIR)/package
+SUPPORT_DIR   = $(BASE_DIR)/support
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/flash-images.mk b/make/flash-images.mk
index 24d73dad..291010ac 100644
--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@@ -204,7 +204,7 @@ flash-image-hd5x-multi: | $(IMAGE_DIR)
 	# Create final USB-image
 	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
 	cp $(EMMC_IMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash.bin
+	cp $(SUPPORT_DIR)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash.bin
 	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
@@ -308,7 +308,7 @@ flash-image-hd6x-multi-recovery: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)/*.txt
 	rm -rf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/*.txt
 	rm -rf $(IMAGE_BUILD_DIR)/$(HD6x_IMAGE_LINK)
-	cp $(TARGET_FILES)/splash-images/ni-splash-$(BOXSERIES).img $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/logo.img
+	cp $(SUPPORT_DIR)/splash-images/ni-splash-$(BOXSERIES).img $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/logo.img
 	echo $(IMAGE_NAME)_recovery > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/recoveryversion
 	echo "***** ACHTUNG *****" >$(IMAGE_BUILD_DIR)/recovery_$(BOXMODEL)_lies.mich
 	echo "Das RECOVERY wird nur benötigt wenn es Probleme beim Zugriff auf das MULTIBOOT MENÜ gibt." >> $(IMAGE_BUILD_DIR)/recovery_$(BOXMODEL)_lies.mich
@@ -361,7 +361,7 @@ flash-image-vuplus-multi: vmlinuz-initrd
 flash-image-vuplus-multi: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_DIR)
 	mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)
-	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin
+	cp $(SUPPORT_DIR)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin
 	cp $(BUILD_DIR)/$(VMLINUZ_INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin
 	echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin
 	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel1_auto.bin
diff --git a/skel-root/general/splash-images/ni-splash-hd6x.img b/support/splash-images/ni-splash-hd6x.img
similarity index 100%
rename from skel-root/general/splash-images/ni-splash-hd6x.img
rename to support/splash-images/ni-splash-hd6x.img
diff --git a/skel-root/general/splash-images/ni-splash.bmp b/support/splash-images/ni-splash.bmp
similarity index 100%
rename from skel-root/general/splash-images/ni-splash.bmp
rename to support/splash-images/ni-splash.bmp
diff --git a/skel-root/general/splash-images/ni-splash.h b/support/splash-images/ni-splash.h
similarity index 100%
rename from skel-root/general/splash-images/ni-splash.h
rename to support/splash-images/ni-splash.h
diff --git a/skel-root/general/splash-images/ni-splash.jpg b/support/splash-images/ni-splash.jpg
similarity index 100%
rename from skel-root/general/splash-images/ni-splash.jpg
rename to support/splash-images/ni-splash.jpg