update aruba image building makefile for latest image.mk changes

[openwrt.git] / target / linux / image / aruba / Makefile

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 835de1b..ddfe8e7 100644 (file)
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -16,14 +16,15 @@ endef
 
 define Image/Prepare
        cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
 
 define Image/Prepare
        cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma

-       $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) compile
+       $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean compile

 endef
 
 endef
 

-define Image/Build
+define Image/BuildKernel

        ./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
        ./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version

-ifneq ($(CONFIG_ARUBA_RAMDISK),y)
+endef
+
+define Image/Build

 ifeq ($(1),jffs2-64k)
 ifeq ($(1),jffs2-64k)

-endif

        @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
        @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