hopefully the last fix for the aruba image stuff

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3942 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index d68084b..c8dab05 100644 (file)
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -23,13 +23,15 @@ define Image/BuildKernel
        ./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
 endef
 
        ./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
 endef
 

-ifeq ($(1),jffs2-64k)
-define Image/Build
+define Image/Build/jffs2-64k

        @dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
        @cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
        @dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin bs=3604480 conv=sync
        @rm -f $(KDIR)/image.tmp
 endef
        @dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
        @cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
        @dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin bs=3604480 conv=sync
        @rm -f $(KDIR)/image.tmp
 endef

-endif
+
+define Image/Build
+       $(call Image/Build/$(1),$(1))
+endef

 
 $(eval $(call BuildImage))
 
 $(eval $(call BuildImage))