fix image archive for zgemma

diff --git a/make/flashimage.mk b/make/flashimage.mk
index 12114de6a35ca0724d65b0eec0b87b2b8e3cf0da..6d1f04acdebb911469c5ee898088b7e28c9385eb 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -124,17 +124,26 @@ endif
        # Truncate on purpose
        dd if=$(IMAGE_BUILD_TMP)/$(HD51_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
        # Create final USB-image
+ifeq ($(BOXMODEL), h7)
+       mkdir -p $(IMAGE_DIR)/zgemma/$(BOXMODEL)
+       cp $(EMMC_IMAGE) $(IMAGE_DIR)/zgemma/$(BOXMODEL)
+       echo $(BOXMODEL)_$(IMAGE_NAME)_usb_$(IMG_DATE) > $(IMAGE_DIR)/zgemma/$(BOXMODEL)/imageversion
+else
        mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
-#      cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
        cp $(EMMC_IMAGE) $(IMAGE_DIR)/$(BOXMODEL)
-#      cd $(RELEASE_DIR); \
-#      tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar --exclude=zImage* -C $(RELEASE_DIR) .  > /dev/null 2>&1; \
-#      bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar
        echo $(BOXMODEL)_$(IMAGE_NAME)_usb_$(IMG_DATE) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion
+endif
+ifeq ($(BOXMODEL), h7)
+       cd $(IMAGE_DIR); \
+       zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_usb_$(IMG_DATE).zip zgemma/$(BOXMODEL)/disk.img zgemma/$(BOXMODEL)/imageversion
+       # cleanup
+       rm -rf $(IMAGE_DIR)/zgemma
+else
        cd $(IMAGE_DIR); \
        zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_usb_$(IMG_DATE).zip $(BOXMODEL)/disk.img $(BOXMODEL)/imageversion
        # cleanup
        rm -rf $(IMAGE_DIR)/$(BOXMODEL)
+endif
        rm -rf $(IMAGE_BUILD_TMP)
 
 flash-image-hd51-multi-rootfs: IMAGE_NAME=$(shell cat $(RELEASE_DIR)/.version | grep "^imagename=" | cut -d= -f2)