From f1bca79bc5c22db214ed45d19e90f446d8ca50d8 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Thu, 17 Dec 2015 12:37:53 +0100
Subject: [PATCH] update flashimage.mk

possibility to customize your flashimage
use flash-customize.sh
---
 Makefile           |  4 ++--
 make/flashimage.mk | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f23f43d..54c8f68 100755
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ wittinobi-neutrino:
 	@echo ""
 
 wittinobi-neutrino-flash:
-	$(MAKE) neutrino applications multimedia plugins skeleton rootfs flash flash-check
+	$(MAKE) neutrino applications multimedia plugins skeleton rootfs flash-prepare flash flash-check
 	@echo ""
 	@echo ' ============================================================================== '
 	@echo -e "    \033[32mmake wittinobi-neutrino-flash done\033[0m"
@@ -143,7 +143,7 @@ wittinobi-neutrino-flash:
 	@echo ""
 
 wittinobi-all:
-	$(MAKE) neutrino applications multimedia plugins skeleton bootloader kernel drivers rootfs flash flash-full flash-check flash-full-check
+	$(MAKE) neutrino applications multimedia plugins skeleton bootloader kernel drivers rootfs flash-prepare flash flash-full flash-check flash-full-check
 	@echo ""
 	@echo ' ============================================================================== '
 	@echo -e "    \033[32mmake wittinobi-all done\033[0m"
diff --git a/make/flashimage.mk b/make/flashimage.mk
index 23a23dc..c021eca 100755
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -2,6 +2,17 @@
 
 DATE := $(shell date +%Y-%m-%d)
 
+flash-customize: $(BASE_DIR)/customize/flash-customize.sh
+	$(BASE_DIR)/customize/flash-customize.sh
+
+flash-prepare:
+	rm -fr $(BUILD_TMP)/install
+	mkdir -p $(BUILD_TMP)/install
+	cp -r $(BUILD_TMP)/rootfs/. $(BUILD_TMP)/install
+	$(MAKE) flash-customize
+	tar zcf $(BUILD_TMP)/rootfs.tar.gz -C $(BUILD_TMP)/install .; \
+	rm -fr $(BUILD_TMP)/install/oldroot
+
 ifeq ($(PLATFORM), nevis)
 
 ERASEBLOCK = 0x20000
@@ -9,14 +20,11 @@ FLASHIMG = $(BUILD_TMP)/nevis-system-tmp.img
 SUMIMG   = $(BUILD_TMP)/nevis-system-$(DATE).sum.img
 
 flash: $(D)/mtd-utils
-	rm -fr $(BUILD_TMP)/rootfs/oldroot
 	echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
-	tar cfz $(BUILD_TMP)/rootfs.tar.gz $(BUILD_TMP)/rootfs; \
-	mkfs.jffs2 -e $(ERASEBLOCK) -p -U -D $(BUILD_TMP)/devtable -d $(BUILD_TMP)/rootfs -o $(FLASHIMG); \
+	mkfs.jffs2 -e $(ERASEBLOCK) -p -U -D $(BUILD_TMP)/devtable -d $(BUILD_TMP)/install -o $(FLASHIMG); \
 	sumtool -e $(ERASEBLOCK) -p -i $(FLASHIMG) -o $(SUMIMG); \
 	rm -f $(BUILD_TMP)/devtable;
 	rm -f $(FLASHIMG); \
-	mkdir -p $(BUILD_TMP)/rootfs/oldroot
 
 endif
 
-- 
2.39.5