fix flashimage.mk

diff --git a/make/flashimage.mk b/make/flashimage.mk
index d245c1d7cc85c52225f125ee91daefc595181b88..c3716446a5e560652171c5abacf1ab1982106be9 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -38,6 +38,14 @@ endif
 IMAGE_DIR       = $(BUILD_TMP)/image
 datadir         = /usr/share
 
+ifeq ($(BOXMODEL),$(filter $(BOXMODEL),h7))
+IMAGE_SUBDIR = zgemma/$(BOXMODEL)
+else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),e4hdultra))
+IMAGE_SUBDIR = e4hd
+else
+IMAGE_SUBDIR = $(BOXMODEL)
+endif
+
 # emmc image
 EMMC_IMAGE_SIZE = 3817472
 EMMC_IMAGE = $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_NAME).img
@@ -117,18 +125,11 @@ endif
        # Truncate on purpose
        dd if=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
        # Create final USB-image
-ifeq ($(BOXMODEL),$(filter $(BOXMODEL),h7))
-       IMAGE_SUBDIR = zgemma/$(BOXMODEL)
-else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),e4hdultra))
-       IMAGE_SUBDIR = e4hd
-else
-       IMAGE_SUBDIR = $(BOXMODEL)
-endif
        mkdir -p $(IMAGE_DIR)/$(IMAGE_SUBDIR)
        cp $(EMMC_IMAGE) $(IMAGE_DIR)/$(IMAGE_SUBDIR)
        echo $(IMAGE_NAME)_$(IMAGE_VERSION)_$(IMG_DATE)_$(BOXMODEL)_multi_usb > $(IMAGE_DIR)/$(IMAGE_SUBDIR)/imageversion
        cd $(IMAGE_DIR); \
-       zip -r $(BUILD_TMP)/$(IMAGE_NAME)_$(IMAGE_VERSION)_$(IMG_DATE)_$(BOXMODEL)_multi_usb.zip $(IMAGE_SUBDIR)/disk.img zgemma/$(BOXMODEL)/imageversion
+       zip -r $(BUILD_TMP)/$(IMAGE_NAME)_$(IMAGE_VERSION)_$(IMG_DATE)_$(BOXMODEL)_multi_usb.zip $(IMAGE_SUBDIR)/disk.img $(IMAGE_SUBDIR)/imageversion
        # cleanup
 ifeq ($(BOXMODEL), h7)
        rm -rf $(IMAGE_DIR)/zgemma