update flashimage.mk

possibility to customize your flashimage
use flash-customize.sh

diff --git a/Makefile b/Makefile
index f23f43d1d46344c9db4b804aecb99e722045c9a5..54c8f68b5e28747edd3514ab54a6fb0b9dc7a7cb 100755 (executable)
--- 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 23a23dc08328cf1384a95566295834862cb69b5a..c021eca803ed4ef41c8cd641769535ace6ad70a2 100755 (executable)
--- 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