small fixes zipping ofg image

diff --git a/Makefile b/Makefile
index 8e949b5ea921e9bc510121c0eb5a6b43ff50922e..f7c4180f15dbd4d71870858b10a11804fad145ba 100755 (executable)
--- 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 cb599be7bc093495ae25abbe5c5c52821c78abec..0b440567fc019633feb7f4739309247743564241 100755 (executable)
--- 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 acc9495f0997aba551fac0942dacd9bf9c940260..fce9b3e7e753442ee734567ac3ad20df15ad6d27 100755 (executable)
--- 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)