From 78c4dddf5eae00e5c9f76fa07ac6c7292dc58b9a Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sat, 24 Mar 2018 11:30:53 +0100
Subject: [PATCH] small fixes zipping ofg image

---
 Makefile           | 2 +-
 make/bootstrap.mk  | 4 ++--
 make/flashimage.mk | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8e949b5..f7c4180 100755
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,7 @@ includes-and-libs:
 	$(MAKE) $(TARGETPREFIX)/lib $(TARGETPREFIX)/lib/firmware
 
 modules:
-	$(MAKE) $(TARGETPREFIX)/lib/modules/$(KVERSION_FULL)
+	$(MAKE) $(TARGETPREFIX)/lib/modules
 
 # post customize
 post-customize: $(BASE_DIR)/customize/post-customize.sh
diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index cb599be..0b44056 100755
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -242,7 +242,7 @@ $(TARGETPREFIX)/lib/firmware: | $(TARGETPREFIX)
 		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/firmware/* $@/; \
 	fi
 
-$(TARGETPREFIX)/lib/modules/$(KVERSION_FULL): | $(TARGETPREFIX)
+$(TARGETPREFIX)/lib/modules: | $(TARGETPREFIX)
 	mkdir -p $@
 	if test -e $(SOURCE_DIR)/git/DRIVERS; then \
 		cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/drivers/$(KVERSION_FULL)/* $@/; \
@@ -277,6 +277,6 @@ ccache: $(HOSTPREFIX)/bin
 # hack to make sure they are always copied
 PHONY += $(TARGETPREFIX)/lib
 PHONY += $(TARGETPREFIX)/lib/firmware
-PHONY += $(TARGETPREFIX)/lib/modules/$(KVERSION_FULL)
+PHONY += $(TARGETPREFIX)/lib/modules/
 PHONY += $(TARGETPREFIX)/lib/libc.so.6
 PHONY += ccache crosstool targetprefix skeleton
diff --git a/make/flashimage.mk b/make/flashimage.mk
index acc9495..fce9b3e 100755
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -98,7 +98,7 @@ flash-image-hd51-multi-rootfs:
 	echo $(BOXMODEL)_$(IMAGE_NAME)_ofg_$(shell date '+%d%m%Y-%H%M%S') > $(IMAGE_DIR)/$(BOXMODEL)/imageversion
 	# Create minimal image
 	cd $(IMAGE_DIR); \
-	zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_ofg_$(shell date '+%d.%m.%Y-%H.%M').zip $(BOXMODEL)/rootfs.tar.bz2 $(BOXMODEL)/kernel.bin $(BOXMODEL)/disk.img $(BOXMODEL)/imageversion
+	zip -r $(BUILD_TMP)/$(BOXMODEL)_multi_ofg_$(shell date '+%d.%m.%Y-%H.%M').zip $(BOXMODEL)/rootfs.tar.bz2 $(BOXMODEL)/kernel.bin $(BOXMODEL)/imageversion
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
 
 
-- 
2.39.5